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 6fadf9e9: Merge "Remove obsolete setkey." 

* commit '6fadf9e93913314f2aea3418539f998d47b40d13':
  Remove obsolete setkey.
This commit is contained in:
Elliott Hughes 2015-03-14 02:35:22 +00:00 committed by Android Git Automerger
parent 2f73d73640 6fadf9e939
commit 24b1c2da7a
4 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
init/builtins.cpp
View File

@ -67,20 +67,6 @@ static int insmod(const char *filename, char *options)
return init_module(&module[0], module.size(), options);
}
static int setkey(struct kbentry *kbe)
{
int fd, ret;
fd = open("/dev/tty0", O_RDWR | O_SYNC | O_CLOEXEC);
if (fd < 0)
return -1;
ret = ioctl(fd, KDSKBENT, kbe);
close(fd);
return ret;
}
static int __ifupdown(const char *interface, int up)
{
struct ifreq ifr;
@ -571,15 +557,6 @@ int do_setcon(int nargs, char **args) {
return 0;
}
int do_setkey(int nargs, char **args)
{
struct kbentry kbe;
kbe.kb_table = strtoul(args[1], 0, 0);
kbe.kb_index = strtoul(args[2], 0, 0);
kbe.kb_value = strtoul(args[3], 0, 0);
return setkey(&kbe);
}
int do_setprop(int nargs, char **args)
{
const char *name = args[1];

1
init/init_parser.cpp
View File

@ -187,7 +187,6 @@ static int lookup_keyword(const char *s)
if (!strcmp(s, "ervice")) return K_service;
if (!strcmp(s, "etcon")) return K_setcon;
if (!strcmp(s, "etenv")) return K_setenv;
if (!strcmp(s, "etkey")) return K_setkey;
if (!strcmp(s, "etprop")) return K_setprop;
if (!strcmp(s, "etrlimit")) return K_setrlimit;
if (!strcmp(s, "ocket")) return K_socket;

2
init/keywords.h
View File

@ -23,7 +23,6 @@ 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_setkey(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);
@ -83,7 +82,6 @@ enum {
KEYWORD(service, SECTION, 0, 0)
KEYWORD(setcon, COMMAND, 1, do_setcon)
KEYWORD(setenv, OPTION, 2, 0)
KEYWORD(setkey, COMMAND, 0, do_setkey)
KEYWORD(setprop, COMMAND, 2, do_setprop)
KEYWORD(setrlimit, COMMAND, 3, do_setrlimit)
KEYWORD(socket, OPTION, 0, 0)

3
init/readme.txt
View File

@ -228,9 +228,6 @@ setcon <seclabel>
This is typically only used from early-init to set the init context
before any other process is started.
setkey
TBD
setprop <name> <value>
Set system property <name> to <value>. Properties are expanded
within <value>.