openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 43329bc1: am 8a387870: Revert "Reload policy after setting up the data partition." 

* commit '43329bc1c99c0f5f3670a8aaab39e54df34819a1':
  Revert "Reload policy after setting up the data partition."
This commit is contained in:
gcondra@google.com 2013-05-20 16:35:34 -07:00 committed by Android Git Automerger
parent 104c33992f 43329bc1c9
commit acef650dbc
5 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
init/builtins.c
View File

@ -516,12 +516,6 @@ int do_mount_all(int nargs, char **args)
return ret;
}
int do_selinux_reload(int nargs, char **args) {
if (is_selinux_enabled() <= 0)
return 0;
return selinux_reload_policy();
}
int do_setcon(int nargs, char **args) {
if (is_selinux_enabled() <= 0)
return 0;

1
init/init_parser.c
View File

@ -140,7 +140,6 @@ int lookup_keyword(const char *s)
break;
case 's':
if (!strcmp(s, "eclabel")) return K_seclabel;
if (!strcmp(s, "elinux_reload_policy")) return K_selinux_reload_policy;
if (!strcmp(s, "ervice")) return K_service;
if (!strcmp(s, "etcon")) return K_setcon;
if (!strcmp(s, "etenforce")) return K_setenforce;

2
init/keywords.h
View File

@ -19,7 +19,6 @@ int do_restart(int nargs, char **args);
int do_restorecon(int nargs, char **args);
int do_rm(int nargs, char **args);
int do_rmdir(int nargs, char **args);
int do_selinux_reload(int nargs, char **args);
int do_setcon(int nargs, char **args);
int do_setenforce(int nargs, char **args);
int do_setkey(int nargs, char **args);
@ -74,7 +73,6 @@ enum {
KEYWORD(rm, COMMAND, 1, do_rm)
KEYWORD(rmdir, COMMAND, 1, do_rmdir)
KEYWORD(seclabel, OPTION, 0, 0)
KEYWORD(selinux_reload_policy, COMMAND, 0, do_selinux_reload)
KEYWORD(service, SECTION, 0, 0)
KEYWORD(setcon, COMMAND, 1, do_setcon)
KEYWORD(setenforce, COMMAND, 1, do_setenforce)

3
init/property_service.c
View File

@ -389,6 +389,9 @@ int property_set(const char *name, const char *value)
* to prevent them from being overwritten by default values.
*/
write_persistent_property(name, value);
} else if (strcmp("selinux.reload_policy", name) == 0 &&
strcmp("1", value) == 0) {
selinux_reload_policy();
}
property_changed(name, value);
return 0;

4
rootdir/init.rc
View File

@ -177,9 +177,6 @@ on post-fs
mkdir /cache/lost+found 0770 root root
on post-fs-data
# reload SELinux based on what we find on the data partition
selinux_reload_policy
# We chown/chmod /data again so because mount is run as root + defaults
chown system system /data
chmod 0771 /data
@ -413,7 +410,6 @@ service ueventd /sbin/ueventd
seclabel u:r:ueventd:s0
on property:selinux.reload_policy=1
selinux_reload_policy
restart ueventd
restart installd