tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 659b7d63: Merge "Remove now-unusable \'setcon\' command."

Browse source 
* commit '659b7d633a03a03674f82f02f567ac5ff18fba41':
  Remove now-unusable 'setcon' command.
This commit is contained in:
Elliott Hughes 2015-04-24 04:07:24 +00:00 committed by Android Git Automerger
commit 301691c258
4 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
init/builtins.cpp
View file

@ -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];

1
init/init_parser.cpp
View file

@ -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;

2
init/keywords.h
View file

@ -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)

5
init/readme.txt
View file

@ -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>.