Merge "init: manually restorecon mke2fs tools on ramdisk" am: e2629c5682
am: 06c1500a14
am: 2ce5eb91c0
Change-Id: I401394f4569ee0783b8bac17a1187634558cf553
This commit is contained in:
commit
6cfade736d
1 changed files with 6 additions and 3 deletions
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue