am 14ad7861: am 538b5d4e: Merge "Add persistent property for SELinux enforcment status." into jb-mr2-dev
* commit '14ad786183455ad9c8298e24946d4da0f24458d7':
Add persistent property for SELinux enforcment status.
diff --git a/init/property_service.c b/init/property_service.c
index 6bf06b4..f6e4053 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -92,6 +92,7 @@
{ "persist.service.", AID_SYSTEM, 0 },
{ "persist.security.", AID_SYSTEM, 0 },
{ "persist.service.bdroid.", AID_BLUETOOTH, 0 },
+ { "persist.selinux.enforcing", AID_SYSTEM, 0},
{ "selinux." , AID_SYSTEM, 0 },
{ NULL, 0, 0 }
};
diff --git a/rootdir/init.rc b/rootdir/init.rc
index b7f9feb..fb58a31 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -416,6 +416,12 @@
restart ueventd
restart installd
+on property:persist.selinux.enforcing=1
+ setenforce 1
+
+on property:persist.selinux.enforcing=0
+ setenforce 0
+
service console /system/bin/sh
class core
console