diff options
| author | Eric Andersen <andersen@codepoet.org> | 2004-08-16 09:29:42 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2004-08-16 09:29:42 +0000 |
| commit | 1f50e84283df7ac846f5abf8789fc253d60caf9c (patch) | |
| tree | 5c66b9b5d99980140f40b5f3ee2ead1cca607148 | |
| parent | 88e38ca2fba03379ef386aff287d871c062a2ae7 (diff) | |
| download | busybox-1f50e84283df7ac846f5abf8789fc253d60caf9c.tar.gz | |
Do not use vfork, as init is not vfork safe. Do not allow
askfirst when mmuless.
| -rw-r--r-- | init/init.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/init/init.c b/init/init.c index 11ebc6bf9..2278e521f 100644 --- a/init/init.c +++ b/init/init.c @@ -53,10 +53,6 @@ #endif -#if defined(__UCLIBC__) && !defined(__ARCH_HAS_MMU__) -#define fork vfork -#endif - #define INIT_BUFFS_SIZE 256 /* From <linux/vt.h> */ @@ -580,6 +576,7 @@ static pid_t run(const struct init_action *a) } } +#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__) if (a->action & ASKFIRST) { char c; /* @@ -597,6 +594,7 @@ static pid_t run(const struct init_action *a) while(read(0, &c, 1) == 1 && c != '\n') ; } +#endif /* Log the process name and args */ message(LOG, "Starting pid %d, console %s: '%s'", |