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

Commit 6cfade73 authored by Jin Qian's avatar Jin Qian Committed by android-build-merger
Browse files

Merge "init: manually restorecon mke2fs tools on ramdisk" am: e2629c56 am: 06c1500a 

am: 2ce5eb91

Change-Id: I401394f4569ee0783b8bac17a1187634558cf553
parents da179e29 2ce5eb91

init/init.cpp

+6 −3
Original line number Diff line number Diff line
@@ -882,9 +882,9 @@ static void selinux_initialize(bool in_kernel_domain) { 
    }

}



// The files and directories that were created before initial sepolicy load

// need to have their security context restored to the proper value.

// This must happen before /dev is populated by ueventd.

// The files and directories that were created before initial sepolicy load or

// files on ramdisk need to have their security context restored to the proper

// value. This must happen before /dev is populated by ueventd.

static void selinux_restore_context() {

    LOG(INFO) << "Running restorecon...";

    restorecon("/dev");
@@ -914,6 +914,9 @@ static void selinux_restore_context() { 
    restorecon("/sys", SELINUX_ANDROID_RESTORECON_RECURSE);

    restorecon("/dev/block", SELINUX_ANDROID_RESTORECON_RECURSE);

    restorecon("/dev/device-mapper");



    restorecon("/sbin/mke2fs");

    restorecon("/sbin/e2fsdroid");

}



// Set the UDC controller for the ConfigFS USB Gadgets.