diff options
Diffstat (limited to 'init')
| -rw-r--r-- | init/builtins.c | 6 | ||||
| -rw-r--r-- | init/init_parser.c | 1 | ||||
| -rw-r--r-- | init/keywords.h | 2 | ||||
| -rwxr-xr-x | init/property_service.c | 3 |
4 files changed, 3 insertions, 9 deletions
diff --git a/init/builtins.c b/init/builtins.c index 275a1af..0f9f131 100644 --- a/init/builtins.c +++ b/init/builtins.c @@ -515,12 +515,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; diff --git a/init/init_parser.c b/init/init_parser.c index 5182a29..686640e 100644 --- a/init/init_parser.c +++ b/init/init_parser.c @@ -138,7 +138,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; diff --git a/init/keywords.h b/init/keywords.h index 55d6af3..f188db5 100644 --- a/init/keywords.h +++ b/init/keywords.h @@ -18,7 +18,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); @@ -72,7 +71,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) diff --git a/init/property_service.c b/init/property_service.c index e8c8869..0989e6d 100755 --- a/init/property_service.c +++ b/init/property_service.c @@ -388,6 +388,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; |