From e99f7500e0475bcef25f3125efdf847c7382c58f Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Mon, 24 Jul 2000 20:15:30 +0000 Subject: chroot can now call the builtin shell --- Changelog | 1 + chroot.c | 5 +++++ coreutils/chroot.c | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/Changelog b/Changelog index 16c2ba1..ac7dba3 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,6 @@ 0.47pre + * chroot can now call the builtin shell - Pavel Roskin * added 'renice' command -- thanks to Dave Cinege * 'make install' now creates relative symlinks, and added a new 'make install-hardlinks' target to (tada) install hardlinks. diff --git a/chroot.c b/chroot.c index 9b1a5a8..e8ce539 100644 --- a/chroot.c +++ b/chroot.c @@ -47,10 +47,15 @@ int chroot_main(int argc, char **argv) prog = *argv; execvp(*argv, argv); } else { +#ifndef BB_SH prog = getenv("SHELL"); if (!prog) prog = "/bin/sh"; execlp(prog, prog, NULL); +#else + shell_main(argc, argv); + exit (0); +#endif } fatalError("cannot execute %s: %s\n", prog, strerror(errno)); diff --git a/coreutils/chroot.c b/coreutils/chroot.c index 9b1a5a8..e8ce539 100644 --- a/coreutils/chroot.c +++ b/coreutils/chroot.c @@ -47,10 +47,15 @@ int chroot_main(int argc, char **argv) prog = *argv; execvp(*argv, argv); } else { +#ifndef BB_SH prog = getenv("SHELL"); if (!prog) prog = "/bin/sh"; execlp(prog, prog, NULL); +#else + shell_main(argc, argv); + exit (0); +#endif } fatalError("cannot execute %s: %s\n", prog, strerror(errno)); -- cgit v1.1