diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-24 20:45:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-24 20:45:29 +0000 |
| commit | 813c769cf6c14e8bca89cb2b18b8d1c156a7b126 (patch) | |
| tree | e74067171d67ca28f457d31f89512c5b49716742 /init | |
| parent | a8088f380932d873a39fafdd816f96328f7caa9c (diff) | |
| parent | e6433c12456324812a9ea791da3bf462ee2476d7 (diff) | |
| download | system_core-813c769cf6c14e8bca89cb2b18b8d1c156a7b126.zip system_core-813c769cf6c14e8bca89cb2b18b8d1c156a7b126.tar.gz system_core-813c769cf6c14e8bca89cb2b18b8d1c156a7b126.tar.bz2 | |
am e6433c12: am a5669861: Merge "Revert "Revert "Remove now-unusable \'setcon\' command."""
* commit 'e6433c12456324812a9ea791da3bf462ee2476d7':
Revert "Revert "Remove now-unusable 'setcon' command.""
Diffstat (limited to 'init')
| -rw-r--r-- | init/builtins.cpp | 9 | ||||
| -rw-r--r-- | init/init_parser.cpp | 1 | ||||
| -rw-r--r-- | init/keywords.h | 2 | ||||
| -rw-r--r-- | init/readme.txt | 5 |
4 files changed, 0 insertions, 17 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index 3bbaf83..4567b04 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -515,15 +515,6 @@ int do_swapon_all(int nargs, char **args) return ret; } -int do_setcon(int nargs, char **args) { - if (is_selinux_enabled() <= 0) - return 0; - if (setcon(args[1]) < 0) { - return -errno; - } - return 0; -} - int do_setprop(int nargs, char **args) { const char *name = args[1]; diff --git a/init/init_parser.cpp b/init/init_parser.cpp index ff31093..b76b04e 100644 --- a/init/init_parser.cpp +++ b/init/init_parser.cpp @@ -184,7 +184,6 @@ static int lookup_keyword(const char *s) case 's': if (!strcmp(s, "eclabel")) return K_seclabel; if (!strcmp(s, "ervice")) return K_service; - if (!strcmp(s, "etcon")) return K_setcon; if (!strcmp(s, "etenv")) return K_setenv; if (!strcmp(s, "etprop")) return K_setprop; if (!strcmp(s, "etrlimit")) return K_setrlimit; diff --git a/init/keywords.h b/init/keywords.h index 059dde1..37f01b8 100644 --- a/init/keywords.h +++ b/init/keywords.h @@ -20,7 +20,6 @@ int do_restorecon(int nargs, char **args); int do_restorecon_recursive(int nargs, char **args); int do_rm(int nargs, char **args); int do_rmdir(int nargs, char **args); -int do_setcon(int nargs, char **args); int do_setprop(int nargs, char **args); int do_setrlimit(int nargs, char **args); int do_start(int nargs, char **args); @@ -76,7 +75,6 @@ enum { KEYWORD(rmdir, COMMAND, 1, do_rmdir) KEYWORD(seclabel, OPTION, 0, 0) KEYWORD(service, SECTION, 0, 0) - KEYWORD(setcon, COMMAND, 1, do_setcon) KEYWORD(setenv, OPTION, 2, 0) KEYWORD(setprop, COMMAND, 2, do_setprop) KEYWORD(setrlimit, COMMAND, 3, do_setrlimit) diff --git a/init/readme.txt b/init/readme.txt index 84afd11..6b9c42d 100644 --- a/init/readme.txt +++ b/init/readme.txt @@ -252,11 +252,6 @@ rm <path> rmdir <path> Calls rmdir(2) on the given path. -setcon <seclabel> - Set the current process security context to the specified string. - This is typically only used from early-init to set the init context - before any other process is started. - setprop <name> <value> Set system property <name> to <value>. Properties are expanded within <value>. |