From: Eric Andersen <andersen@codepoet.org>
Date: Sun, 21 Nov 1999 21:50:07 +0000 (-0000)
Subject: Stuf
X-Git-Tag: 0_39~50
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0727458a97350158340b81c874ad7bce4378b96c;p=oweals%2Fbusybox.git

Stuf
---

diff --git a/Makefile b/Makefile
index c982cc676..c715c0bd6 100644
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,7 @@ force:
 
 $(OBJECTS):  busybox.def.h internal.h Makefile
 
-install: busybox
+install: busybox busybox.links
 	./install.sh $(PREFIX)
 
 whichversion:
diff --git a/init.c b/init.c
index ce2f237c7..75a659911 100644
--- a/init.c
+++ b/init.c
@@ -447,7 +447,8 @@ extern int init_main(int argc, char **argv)
 
     
 #ifndef DEBUG_INIT
-    if (getpid() != 1) {
+    /* Expect to be PID 1 iff 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");
     }
diff --git a/init/init.c b/init/init.c
index ce2f237c7..75a659911 100644
--- a/init/init.c
+++ b/init/init.c
@@ -447,7 +447,8 @@ extern int init_main(int argc, char **argv)
 
     
 #ifndef DEBUG_INIT
-    if (getpid() != 1) {
+    /* Expect to be PID 1 iff 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");
     }