Upgrade the standalone shell code to use CONFIG_BUSYBOX_EXEC_PATH.

This commit is contained in:
Rob Landley
2006-06-14 01:27:01 +00:00
parent c7ddefc062
commit a34b48abe5
2 changed files with 2 additions and 5 deletions

View File

@@ -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 */
}