diff options
| author | Matt Kraai <kraai@debian.org> | 2001-06-12 20:55:02 +0000 |
|---|---|---|
| committer | Matt Kraai <kraai@debian.org> | 2001-06-12 20:55:02 +0000 |
| commit | 7bd773c9fe12ba78a9ab2041bc96f0cf1d453832 (patch) | |
| tree | f699f05e05eb7424bee359eb7f8a2975b04f329e | |
| parent | 0915c4b98533502b23b8021d0aa7b1a8c7f7ea4f (diff) | |
| download | busybox-7bd773c9fe12ba78a9ab2041bc96f0cf1d453832.tar.gz | |
Only use a login shell when it will run on a console.
| -rw-r--r-- | init.c | 21 | ||||
| -rw-r--r-- | init/init.c | 21 |
2 files changed, 22 insertions, 20 deletions
@@ -124,7 +124,8 @@ static const int RB_AUTOBOOT = 0x01234567; #define VT_LOG "/dev/tty5" /* Virtual console */ #define SERIAL_CON0 "/dev/ttyS0" /* Primary serial console */ #define SERIAL_CON1 "/dev/ttyS1" /* Serial console */ -#define SHELL "-/bin/sh" /* Default shell */ +#define SHELL "/bin/sh" /* Default shell */ +#define LOGIN_SHELL "-" SHELL /* Default login shell */ #define INITTAB "/etc/inittab" /* inittab file location */ #ifndef INIT_SCRIPT #define INIT_SCRIPT "/etc/init.d/rcS" /* Default sysinit script. */ @@ -435,7 +436,7 @@ static pid_t run(char *command, char *terminal, int get_enter) termType, "HOME=/", "PATH=/usr/bin:/bin:/usr/sbin:/sbin", - "SHELL=/bin/sh", + "SHELL=" SHELL, "USER=root", NULL }; @@ -782,16 +783,16 @@ static void parse_inittab(void) /* Umount all filesystems on halt/reboot */ new_initAction(SHUTDOWN, "/bin/umount -a -r", console); /* Askfirst shell on tty1 */ - new_initAction(ASKFIRST, SHELL, console); + new_initAction(ASKFIRST, LOGIN_SHELL, console); /* Askfirst shell on tty2 */ if (secondConsole != NULL) - new_initAction(ASKFIRST, SHELL, secondConsole); + new_initAction(ASKFIRST, LOGIN_SHELL, secondConsole); /* Askfirst shell on tty3 */ if (thirdConsole != NULL) - new_initAction(ASKFIRST, SHELL, thirdConsole); + new_initAction(ASKFIRST, LOGIN_SHELL, thirdConsole); /* Askfirst shell on tty4 */ if (fourthConsole != NULL) - new_initAction(ASKFIRST, SHELL, fourthConsole); + new_initAction(ASKFIRST, LOGIN_SHELL, fourthConsole); /* sysinit */ new_initAction(SYSINIT, INIT_SCRIPT, console); @@ -944,13 +945,13 @@ extern int init_main(int argc, char **argv) !strcmp(argv[1], "-s") || !strcmp(argv[1], "1"))) { /* Ask first then start a shell on tty2-4 */ if (secondConsole != NULL) - new_initAction(ASKFIRST, SHELL, secondConsole); + new_initAction(ASKFIRST, LOGIN_SHELL, secondConsole); if (thirdConsole != NULL) - new_initAction(ASKFIRST, SHELL, thirdConsole); + new_initAction(ASKFIRST, LOGIN_SHELL, thirdConsole); if (fourthConsole != NULL) - new_initAction(ASKFIRST, SHELL, fourthConsole); + new_initAction(ASKFIRST, LOGIN_SHELL, fourthConsole); /* Start a shell on tty1 */ - new_initAction(RESPAWN, SHELL, console); + new_initAction(RESPAWN, LOGIN_SHELL, console); } else { /* Not in single user mode -- see what inittab says */ diff --git a/init/init.c b/init/init.c index 6369ef959..e057caa7e 100644 --- a/init/init.c +++ b/init/init.c @@ -124,7 +124,8 @@ static const int RB_AUTOBOOT = 0x01234567; #define VT_LOG "/dev/tty5" /* Virtual console */ #define SERIAL_CON0 "/dev/ttyS0" /* Primary serial console */ #define SERIAL_CON1 "/dev/ttyS1" /* Serial console */ -#define SHELL "-/bin/sh" /* Default shell */ +#define SHELL "/bin/sh" /* Default shell */ +#define LOGIN_SHELL "-" SHELL /* Default login shell */ #define INITTAB "/etc/inittab" /* inittab file location */ #ifndef INIT_SCRIPT #define INIT_SCRIPT "/etc/init.d/rcS" /* Default sysinit script. */ @@ -435,7 +436,7 @@ static pid_t run(char *command, char *terminal, int get_enter) termType, "HOME=/", "PATH=/usr/bin:/bin:/usr/sbin:/sbin", - "SHELL=/bin/sh", + "SHELL=" SHELL, "USER=root", NULL }; @@ -782,16 +783,16 @@ static void parse_inittab(void) /* Umount all filesystems on halt/reboot */ new_initAction(SHUTDOWN, "/bin/umount -a -r", console); /* Askfirst shell on tty1 */ - new_initAction(ASKFIRST, SHELL, console); + new_initAction(ASKFIRST, LOGIN_SHELL, console); /* Askfirst shell on tty2 */ if (secondConsole != NULL) - new_initAction(ASKFIRST, SHELL, secondConsole); + new_initAction(ASKFIRST, LOGIN_SHELL, secondConsole); /* Askfirst shell on tty3 */ if (thirdConsole != NULL) - new_initAction(ASKFIRST, SHELL, thirdConsole); + new_initAction(ASKFIRST, LOGIN_SHELL, thirdConsole); /* Askfirst shell on tty4 */ if (fourthConsole != NULL) - new_initAction(ASKFIRST, SHELL, fourthConsole); + new_initAction(ASKFIRST, LOGIN_SHELL, fourthConsole); /* sysinit */ new_initAction(SYSINIT, INIT_SCRIPT, console); @@ -944,13 +945,13 @@ extern int init_main(int argc, char **argv) !strcmp(argv[1], "-s") || !strcmp(argv[1], "1"))) { /* Ask first then start a shell on tty2-4 */ if (secondConsole != NULL) - new_initAction(ASKFIRST, SHELL, secondConsole); + new_initAction(ASKFIRST, LOGIN_SHELL, secondConsole); if (thirdConsole != NULL) - new_initAction(ASKFIRST, SHELL, thirdConsole); + new_initAction(ASKFIRST, LOGIN_SHELL, thirdConsole); if (fourthConsole != NULL) - new_initAction(ASKFIRST, SHELL, fourthConsole); + new_initAction(ASKFIRST, LOGIN_SHELL, fourthConsole); /* Start a shell on tty1 */ - new_initAction(RESPAWN, SHELL, console); + new_initAction(RESPAWN, LOGIN_SHELL, console); } else { /* Not in single user mode -- see what inittab says */ |