ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init: manually restorecon mke2fs tools on ramdisk" am: e2629c5682 am: 06c1500a14

Browse source 
am: 2ce5eb91c0

Change-Id: I401394f4569ee0783b8bac17a1187634558cf553
This commit is contained in:
Jin Qian 2017-05-04 02:17:50 +00:00 • committed by android-build-merger
commit 6cfade736d
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
init/init.cpp
View file

@ -882,9 +882,9 @@ static void selinux_initialize(bool in_kernel_domain) {
} }
} }
// The files and directories that were created before initial sepolicy load // The files and directories that were created before initial sepolicy load or
// need to have their security context restored to the proper value. // files on ramdisk need to have their security context restored to the proper
// This must happen before /dev is populated by ueventd. // value. This must happen before /dev is populated by ueventd.
static void selinux_restore_context() { static void selinux_restore_context() {
LOG(INFO) << "Running restorecon..."; LOG(INFO) << "Running restorecon...";
restorecon("/dev"); restorecon("/dev");
@ -914,6 +914,9 @@ static void selinux_restore_context() {
restorecon("/sys", SELINUX_ANDROID_RESTORECON_RECURSE); restorecon("/sys", SELINUX_ANDROID_RESTORECON_RECURSE);
restorecon("/dev/block", SELINUX_ANDROID_RESTORECON_RECURSE); restorecon("/dev/block", SELINUX_ANDROID_RESTORECON_RECURSE);
restorecon("/dev/device-mapper"); restorecon("/dev/device-mapper");
restorecon("/sbin/mke2fs");
restorecon("/sbin/e2fsdroid");
} }
// Set the UDC controller for the ConfigFS USB Gadgets. // Set the UDC controller for the ConfigFS USB Gadgets.