diff options
| author | Elliott Hughes <enh@google.com> | 2015-03-14 04:08:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-14 04:08:30 +0000 |
| commit | fde65571d7fc700c987d6ad4bbb6e469b383bbde (patch) | |
| tree | 2a3ad7102516a7a17326a41056dd2e9e91721f5f /init | |
| parent | e93fb4ced00bcbf8cfb9d5a146340f33b9839d66 (diff) | |
| parent | 24b1c2da7a704800d77ebd99d5df9f379e4e5e81 (diff) | |
| download | system_core-fde65571d7fc700c987d6ad4bbb6e469b383bbde.zip system_core-fde65571d7fc700c987d6ad4bbb6e469b383bbde.tar.gz system_core-fde65571d7fc700c987d6ad4bbb6e469b383bbde.tar.bz2 | |
am 24b1c2da: am 6fadf9e9: Merge "Remove obsolete setkey."
* commit '24b1c2da7a704800d77ebd99d5df9f379e4e5e81':
Remove obsolete setkey.
Diffstat (limited to 'init')
| -rw-r--r-- | init/builtins.cpp | 23 | ||||
| -rw-r--r-- | init/init_parser.cpp | 1 | ||||
| -rw-r--r-- | init/keywords.h | 2 | ||||
| -rw-r--r-- | init/readme.txt | 3 |
4 files changed, 0 insertions, 29 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index 3d2e552..5d1ad29 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -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]; diff --git a/init/init_parser.cpp b/init/init_parser.cpp index 2ee4f86..7f8e302 100644 --- a/init/init_parser.cpp +++ b/init/init_parser.cpp @@ -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; diff --git a/init/keywords.h b/init/keywords.h index 486e536..0b37e27 100644 --- a/init/keywords.h +++ b/init/keywords.h @@ -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) diff --git a/init/readme.txt b/init/readme.txt index fdcc9eb..d2933b9 100644 --- a/init/readme.txt +++ b/init/readme.txt @@ -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>. |