aboutsummaryrefslogtreecommitdiff
path: root/shell/ash.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-06-14 01:27:01 +0000
committerRob Landley <rob@landley.net>2006-06-14 01:27:01 +0000
commita34b48abe511b0e469d8b74f99902cc4df45d93d (patch)
treeaf3980cb1fc3ddea246f93d32d5d9f1dcb436b49 /shell/ash.c
parentc7ddefc0624173de6b74ee5b5b39cb2d354f5ae6 (diff)
downloadbusybox-w32-a34b48abe511b0e469d8b74f99902cc4df45d93d.tar.gz
busybox-w32-a34b48abe511b0e469d8b74f99902cc4df45d93d.tar.bz2
busybox-w32-a34b48abe511b0e469d8b74f99902cc4df45d93d.zip
Upgrade the standalone shell code to use CONFIG_BUSYBOX_EXEC_PATH.
Diffstat (limited to 'shell/ash.c')
-rw-r--r--shell/ash.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 713898a9f..a0eb4e36f 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -3737,9 +3737,7 @@ tryexec(char *cmd, char **argv, char **envp)
3737#ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL 3737#ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL
3738 if(find_applet_by_name(cmd) != NULL) { 3738 if(find_applet_by_name(cmd) != NULL) {
3739 /* re-exec ourselves with the new arguments */ 3739 /* re-exec ourselves with the new arguments */
3740 execve("/proc/self/exe",argv,envp); 3740 execve(CONFIG_BUSYBOX_EXEC_PATH,argv,envp);
3741 /* If proc isn't mounted, try hardcoded path to busybox binary*/
3742 execve("/bin/busybox",argv,envp);
3743 /* If they called chroot or otherwise made the binary no longer 3741 /* If they called chroot or otherwise made the binary no longer
3744 * executable, fall through */ 3742 * executable, fall through */
3745 } 3743 }