From: Rob Landley <rob@landley.net>
Date: Wed, 14 Jun 2006 01:27:01 +0000 (-0000)
Subject: Upgrade the standalone shell code to use CONFIG_BUSYBOX_EXEC_PATH.
X-Git-Tag: 1_2_0~147
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a34b48abe511b0e469d8b74f99902cc4df45d93d;p=platform%2Fupstream%2Fbusybox.git

Upgrade the standalone shell code to use CONFIG_BUSYBOX_EXEC_PATH.
---

diff --git a/shell/ash.c b/shell/ash.c
index 713898a..a0eb4e3 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -3737,9 +3737,7 @@ tryexec(char *cmd, char **argv, char **envp)
 #ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL
 	if(find_applet_by_name(cmd) != NULL) {
 		/* re-exec ourselves with the new arguments */
-		execve("/proc/self/exe",argv,envp);
-		/* If proc isn't mounted, try hardcoded path to busybox binary*/
-		execve("/bin/busybox",argv,envp);
+		execve(CONFIG_BUSYBOX_EXEC_PATH,argv,envp);
 		/* If they called chroot or otherwise made the binary no longer
 		 * executable, fall through */
 	}
diff --git a/shell/msh.c b/shell/msh.c
index 62e6b6e..bd4b8fd 100644
--- a/shell/msh.c
+++ b/shell/msh.c
@@ -3306,8 +3306,7 @@ char *c, **v, **envp;
 		/* We have to exec here since we vforked.  Running
 		 * run_applet_by_name() won't work and bad things
 		 * will happen. */
-		execve("/proc/self/exe", v, envp);
-		execve("busybox", v, envp);
+		execve(CONFIG_BUSYBOX_EXEC_PATH, v, envp);
 	}
 #endif