diff options
author | proski <proski@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2000-07-24 20:15:30 +0000 |
---|---|---|
committer | proski <proski@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2000-07-24 20:15:30 +0000 |
commit | df0a4b6b13048bd18b459f7dbb6ad7289338d1dd (patch) | |
tree | 4752e95bbd3116b181c02e52f71500f952597cf3 /coreutils | |
parent | 18850224eba1726999c4f194e173ded17cacb604 (diff) | |
download | busybox-w32-df0a4b6b13048bd18b459f7dbb6ad7289338d1dd.tar.gz busybox-w32-df0a4b6b13048bd18b459f7dbb6ad7289338d1dd.tar.bz2 busybox-w32-df0a4b6b13048bd18b459f7dbb6ad7289338d1dd.zip |
chroot can now call the builtin shell
git-svn-id: svn://busybox.net/trunk/busybox@899 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/chroot.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/coreutils/chroot.c b/coreutils/chroot.c index 9b1a5a82d..e8ce53973 100644 --- a/coreutils/chroot.c +++ b/coreutils/chroot.c | |||
@@ -47,10 +47,15 @@ int chroot_main(int argc, char **argv) | |||
47 | prog = *argv; | 47 | prog = *argv; |
48 | execvp(*argv, argv); | 48 | execvp(*argv, argv); |
49 | } else { | 49 | } else { |
50 | #ifndef BB_SH | ||
50 | prog = getenv("SHELL"); | 51 | prog = getenv("SHELL"); |
51 | if (!prog) | 52 | if (!prog) |
52 | prog = "/bin/sh"; | 53 | prog = "/bin/sh"; |
53 | execlp(prog, prog, NULL); | 54 | execlp(prog, prog, NULL); |
55 | #else | ||
56 | shell_main(argc, argv); | ||
57 | exit (0); | ||
58 | #endif | ||
54 | } | 59 | } |
55 | fatalError("cannot execute %s: %s\n", prog, strerror(errno)); | 60 | fatalError("cannot execute %s: %s\n", prog, strerror(errno)); |
56 | 61 | ||