aboutsummaryrefslogtreecommitdiff
path: root/shell/ash.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-07-07 19:08:56 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-07-18 19:20:58 +0200
commit54916641be96b6b13e3df9b09dd5a78abefb612b (patch)
tree72b69b752000bb262f97669f6d7b91b770b8f38b /shell/ash.c
parent80cb8796f86754faa1569994b9355eeffe0b7759 (diff)
downloadbusybox-w32-54916641be96b6b13e3df9b09dd5a78abefb612b.tar.gz
busybox-w32-54916641be96b6b13e3df9b09dd5a78abefb612b.tar.bz2
busybox-w32-54916641be96b6b13e3df9b09dd5a78abefb612b.zip
main: fix the case where user has "halt" as login shell. Closes 9986
halt::0:0::/:/sbin/halt function old new delta run_applet_and_exit 748 751 +3 run_applet_no_and_exit 467 459 -8 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/ash.c')
-rw-r--r--shell/ash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 6d46e3719..2e1d1e7b7 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -7688,7 +7688,7 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char **
7688 clearenv(); 7688 clearenv();
7689 while (*envp) 7689 while (*envp)
7690 putenv(*envp++); 7690 putenv(*envp++);
7691 run_applet_no_and_exit(applet_no, argv); 7691 run_applet_no_and_exit(applet_no, cmd, argv);
7692 } 7692 }
7693 /* re-exec ourselves with the new arguments */ 7693 /* re-exec ourselves with the new arguments */
7694 execve(bb_busybox_exec_path, argv, envp); 7694 execve(bb_busybox_exec_path, argv, envp);