Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b76e868 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge changes from topic "e2fsprogs_vendor_ramdisk" am: 15cd1cd8 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1506379

Change-Id: Ie0a06de38161c061ab839cc49af55c16d959be61
parents 0f412f06 15cd1cd8

libcutils/fs_config.cpp

+6 −1
Original line number Diff line number Diff line
@@ -203,9 +203,14 @@ static const struct fs_path_config android_files[] = { 
                                           CAP_MASK_LONG(CAP_SETGID),

                                              "system/bin/simpleperf_app_runner" },

    { 00755, AID_ROOT,      AID_ROOT,      0, "first_stage_ramdisk/system/bin/e2fsck" },

    { 00755, AID_ROOT,      AID_ROOT,      0, "first_stage_ramdisk/system/bin/tune2fs" },

#ifdef __LP64__

    { 00755, AID_ROOT,      AID_ROOT,      0, "first_stage_ramdisk/system/bin/linker64" },

#else

    { 00755, AID_ROOT,      AID_ROOT,      0, "first_stage_ramdisk/system/bin/linker" },

#endif

    { 00755, AID_ROOT,      AID_ROOT,      0, "first_stage_ramdisk/system/bin/resize2fs" },

    { 00755, AID_ROOT,      AID_ROOT,      0, "first_stage_ramdisk/system/bin/snapuserd" },

    { 00755, AID_ROOT,      AID_ROOT,      0, "first_stage_ramdisk/system/bin/tune2fs" },

    // generic defaults

    { 00755, AID_ROOT,      AID_ROOT,      0, "bin/*" },

    { 00640, AID_ROOT,      AID_SHELL,     0, "fstab.*" },