diff options
author | Erik Andersen <andersen@codepoet.org> | 2000-02-24 21:09:58 +0300 |
---|---|---|
committer | Erik Andersen <andersen@codepoet.org> | 2000-02-24 21:09:58 +0300 |
commit | a51ecdd9e4025d072d2737d6bea8a1d03bc74274 (patch) | |
tree | c9a3a179b8e9d2f149d63e9eeddfe9331f9b66db | |
parent | 5b911ddd577373dfcbd3d2dade7089ff611ea35e (diff) |
Minor tweak to argv[0] handling for linuxrc
-Erik
-rw-r--r-- | init.c | 14 | ||||
-rw-r--r-- | init/init.c | 14 |
2 files changed, 20 insertions, 8 deletions
@@ -803,10 +803,16 @@ extern int init_main(int argc, char **argv) int status; #ifndef DEBUG_INIT - /* Expect to be PID 1 if we are run as init (not linuxrc) */ - if (getpid() != 1 && strstr(argv[0], "init") != NULL) { - usage("init\n\nInit is the parent of all processes.\n\n" - "This version of init is designed to be run only by the kernel\n"); + /* Expect to be invoked as init with PID=1 or be invoked as linuxrc */ + if (getpid() != 1 +#ifdef BB_FEATURE_LINUXRC + && strstr(argv[0], "linuxrc") == NULL +#endif + ) + { + usage("init\n\nInit is the parent of all processes.\n\n" + "This version of init is designed to be run only " + "by the kernel.\n"); } /* Set up sig handlers -- be sure to * clear all of these in run() */ diff --git a/init/init.c b/init/init.c index 6ec811599..183739180 100644 --- a/init/init.c +++ b/init/init.c @@ -803,10 +803,16 @@ extern int init_main(int argc, char **argv) int status; #ifndef DEBUG_INIT - /* Expect to be PID 1 if we are run as init (not linuxrc) */ - if (getpid() != 1 && strstr(argv[0], "init") != NULL) { - usage("init\n\nInit is the parent of all processes.\n\n" - "This version of init is designed to be run only by the kernel\n"); + /* Expect to be invoked as init with PID=1 or be invoked as linuxrc */ + if (getpid() != 1 +#ifdef BB_FEATURE_LINUXRC + && strstr(argv[0], "linuxrc") == NULL +#endif + ) + { + usage("init\n\nInit is the parent of all processes.\n\n" + "This version of init is designed to be run only " + "by the kernel.\n"); } /* Set up sig handlers -- be sure to * clear all of these in run() */ |