Jamie Guinan writes:

It looks like latest uClibc defines ARCH_HAS_MMU, but a few busybox files
test UCLIBC_HAS_MMU, resulting in vfork() getting called instead of
fork(), etc.

Patch below.   Only tested for lash.

Cheers,
-Jamie

3 files changed, 6 insertions, 6 deletions

diff --git a/init/init.c b/init/init.c
index 159b53912..ae2fd4c3a 100644
--- a/init/init.c
+++ b/init/init.c
@@ -53,7 +53,7 @@
 #endif
 
 
-#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_MMU__)
+#if defined(__UCLIBC__) && !defined(__ARCH_HAS_MMU__)
 #define fork    vfork
 #endif
 
@@ -913,7 +913,7 @@ static void check_memory(void)
         if (check_free_memory() > 1000)
                 return;
 
-#if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__)
+#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__)
         if (stat("/etc/fstab", &statBuf) == 0) {
                 /* swapon -a requires /proc typically */
                 new_init_action(SYSINIT, "/bin/mount -t proc proc /proc", "");
@@ -957,7 +957,7 @@ static void parse_inittab(void)
                 new_init_action(CTRLALTDEL, "/sbin/reboot", "");
                 /* Umount all filesystems on halt/reboot */
                 new_init_action(SHUTDOWN, "/bin/umount -a -r", "");
-#if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__)
+#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__)
                 /* Swapoff on halt/reboot */
                 new_init_action(SHUTDOWN, "/sbin/swapoff -a", "");
 #endif
diff --git a/shell/hush.c b/shell/hush.c
index ad5ddf0d5..8f4cc9780 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1439,7 +1439,7 @@ static int run_pipe_real(struct pipe *pi)
                 }
 
                 /* XXX test for failed fork()? */
-#if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__)
+#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__)
                 if (!(child->pid = fork()))
 #else
                 if (!(child->pid = vfork()))
@@ -2258,7 +2258,7 @@ FILE *generate_stream_from_list(struct pipe *head)
 #if 1
         int pid, channel[2];
         if (pipe(channel)<0) bb_perror_msg_and_die("pipe");
-#if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__)
+#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__)
         pid=fork();
 #else
         pid=vfork();
diff --git a/shell/lash.c b/shell/lash.c
index b46cee807..fa416c742 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -1380,7 +1380,7 @@ static int run_command(struct job *newjob, int inbg, int outpipe[2])
                         }
                 }
 
-#if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__)
+#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__)
                 if (!(child->pid = fork()))
 #else
                 if (!(child->pid = vfork()))