summaryrefslogtreecommitdiffhomepage
path: root/shell
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-06-08 15:02:55 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-06-08 15:02:55 +0000
commitbdbbb7ec49040563628758a2581a5f8e44f53277 (patch)
tree040fdad2cf7f793717c7088c24047b654732541b /shell
parentc14d39e83a7f55ab9b92e98673a281fd6565c32d (diff)
make busybox --install work even if /proc/self/exe doesn't exist
# size busybox_old busybox_unstripped text data bss dec hex filename 680095 2704 15648 698447 aa84f busybox_old 680099 2704 15648 698451 aa853 busybox_unstripped
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c2
-rw-r--r--shell/hush.c2
-rw-r--r--shell/msh.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c
index ea10a65cf..29d8713b7 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -6471,7 +6471,7 @@ tryexec(char *cmd, char **argv, char **envp)
run_current_applet_and_exit(argv);
}
/* re-exec ourselves with the new arguments */
- execve(CONFIG_BUSYBOX_EXEC_PATH, argv, envp);
+ execve(bb_busybox_exec_path, argv, envp);
/* If they called chroot or otherwise made the binary no longer
* executable, fall through */
}
diff --git a/shell/hush.c b/shell/hush.c
index 2a4076ed2..40bcafdd9 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1392,7 +1392,7 @@ static void pseudo_exec_argv(char **argv)
}
/* re-exec ourselves with the new arguments */
debug_printf_exec("re-execing applet '%s'\n", argv[0]);
- execvp(CONFIG_BUSYBOX_EXEC_PATH, argv);
+ execvp(bb_busybox_exec_path, argv);
/* 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 d81a00122..aab805ff5 100644
--- a/shell/msh.c
+++ b/shell/msh.c
@@ -3062,7 +3062,7 @@ static const char *rexecve(char *c, char **v, char **envp)
/* We have to exec here since we vforked. Running
* run_applet_and_exit() won't work and bad things
* will happen. */
- execve(CONFIG_BUSYBOX_EXEC_PATH, v, envp);
+ execve(bb_busybox_exec_path, v, envp);
}
}