summaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorDenys Vlasenko2011-03-08 21:00:36 +0100
committerDenys Vlasenko2011-03-08 21:00:36 +0100
commit681efe20d327e9e6774b174a617d66bbb9d21f48 (patch)
tree4331e443ee303c24364b1655651c8584db8b51c1 /coreutils
parent86cf0364bd58e07646a23a1128e4a9ea79189579 (diff)
downloadbusybox-681efe20d327e9e6774b174a617d66bbb9d21f48.zip
busybox-681efe20d327e9e6774b174a617d66bbb9d21f48.tar.gz
use user's shell instead of hardwired "/bin/sh" (android needs this)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/chroot.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index b80a12e..5ac2e89 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -23,11 +23,9 @@ int chroot_main(int argc UNUSED_PARAM, char **argv)
++argv;
if (!*argv) { /* no 2nd param (PROG), use shell */
argv -= 2;
- argv[0] = getenv("SHELL");
- if (!argv[0]) {
- argv[0] = (char *) DEFAULT_SHELL;
- }
- argv[1] = (char *) "-i";
+ argv[0] = (char *) get_shell_name();
+ argv[1] = (char *) "-i"; /* GNU coreutils 8.4 compat */
+ /*argv[2] = NULL; - already is */
}
BB_EXECVP_or_die(argv);