From 7010301933d428874a2a0dee083a4030e64bcc14 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 18 Mar 2015 12:41:54 -0700 Subject: Remove chroot from init. This is not obviously useful. Let's wait until we have an actual need. Change-Id: I2c75c96314b281e89df25b6ed202b3dd5dfdaf15 --- init/builtins.cpp | 6 ------ init/init_parser.cpp | 1 - init/keywords.h | 2 -- init/readme.txt | 3 --- 4 files changed, 12 deletions(-) (limited to 'init') diff --git a/init/builtins.cpp b/init/builtins.cpp index 543f89b..fb1aa7c 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -104,12 +104,6 @@ static void service_start_if_not_disabled(struct service *svc) } } -int do_chroot(int nargs, char **args) -{ - chroot(args[1]); - return 0; -} - int do_class_start(int nargs, char **args) { /* Starting a class does not start services diff --git a/init/init_parser.cpp b/init/init_parser.cpp index 5ef54c8..f3d34b2 100644 --- a/init/init_parser.cpp +++ b/init/init_parser.cpp @@ -121,7 +121,6 @@ static int lookup_keyword(const char *s) case 'c': if (!strcmp(s, "opy")) return K_copy; if (!strcmp(s, "apability")) return K_capability; - if (!strcmp(s, "hroot")) return K_chroot; if (!strcmp(s, "lass")) return K_class; if (!strcmp(s, "lass_start")) return K_class_start; if (!strcmp(s, "lass_stop")) return K_class_stop; diff --git a/init/keywords.h b/init/keywords.h index 4af8c9e..c8327c3 100644 --- a/init/keywords.h +++ b/init/keywords.h @@ -1,6 +1,5 @@ #ifndef KEYWORD int do_bootchart_init(int nargs, char **args); -int do_chroot(int nargs, char **args); int do_class_start(int nargs, char **args); int do_class_stop(int nargs, char **args); int do_class_reset(int nargs, char **args); @@ -45,7 +44,6 @@ enum { K_UNKNOWN, #endif KEYWORD(capability, OPTION, 0, 0) - KEYWORD(chroot, COMMAND, 1, do_chroot) KEYWORD(class, OPTION, 0, 0) KEYWORD(class_start, COMMAND, 1, do_class_start) KEYWORD(class_stop, COMMAND, 1, do_class_stop) diff --git a/init/readme.txt b/init/readme.txt index 0a85a95..7443330 100644 --- a/init/readme.txt +++ b/init/readme.txt @@ -170,9 +170,6 @@ chmod chown Change file owner and group. -chroot - Change process root directory. - class_start Start all services of the specified class if they are not already running. -- cgit v1.1