emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only use a login shell when it will run on a console.

Browse Source
This commit is contained in:
Matt Kraai 2001-06-12 20:55:02 +00:00
parent 0915c4b985
commit 7bd773c9fe
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
init.c
View File

@ -124,7 +124,8 @@ static const int RB_AUTOBOOT = 0x01234567;
#define VT_LOG "/dev/tty5" /* Virtual console */ #define VT_LOG "/dev/tty5" /* Virtual console */
#define SERIAL_CON0 "/dev/ttyS0" /* Primary serial console */ #define SERIAL_CON0 "/dev/ttyS0" /* Primary serial console */
#define SERIAL_CON1 "/dev/ttyS1" /* 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 */ #define INITTAB "/etc/inittab" /* inittab file location */
#ifndef INIT_SCRIPT #ifndef INIT_SCRIPT
#define INIT_SCRIPT "/etc/init.d/rcS" /* Default sysinit 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, termType,
"HOME=/", "HOME=/",
"PATH=/usr/bin:/bin:/usr/sbin:/sbin", "PATH=/usr/bin:/bin:/usr/sbin:/sbin",
"SHELL=/bin/sh", "SHELL=" SHELL,
"USER=root", "USER=root",
NULL NULL
}; };
@ -782,16 +783,16 @@ static void parse_inittab(void)
/* Umount all filesystems on halt/reboot */ /* Umount all filesystems on halt/reboot */
new_initAction(SHUTDOWN, "/bin/umount -a -r", console); new_initAction(SHUTDOWN, "/bin/umount -a -r", console);
/* Askfirst shell on tty1 */ /* Askfirst shell on tty1 */
new_initAction(ASKFIRST, SHELL, console); new_initAction(ASKFIRST, LOGIN_SHELL, console);
/* Askfirst shell on tty2 */ /* Askfirst shell on tty2 */
if (secondConsole != NULL) if (secondConsole != NULL)
new_initAction(ASKFIRST, SHELL, secondConsole); new_initAction(ASKFIRST, LOGIN_SHELL, secondConsole);
/* Askfirst shell on tty3 */ /* Askfirst shell on tty3 */
if (thirdConsole != NULL) if (thirdConsole != NULL)
new_initAction(ASKFIRST, SHELL, thirdConsole); new_initAction(ASKFIRST, LOGIN_SHELL, thirdConsole);
/* Askfirst shell on tty4 */ /* Askfirst shell on tty4 */
if (fourthConsole != NULL) if (fourthConsole != NULL)
new_initAction(ASKFIRST, SHELL, fourthConsole); new_initAction(ASKFIRST, LOGIN_SHELL, fourthConsole);
/* sysinit */ /* sysinit */
new_initAction(SYSINIT, INIT_SCRIPT, console); 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"))) { !strcmp(argv[1], "-s") || !strcmp(argv[1], "1"))) {
/* Ask first then start a shell on tty2-4 */ /* Ask first then start a shell on tty2-4 */
if (secondConsole != NULL) if (secondConsole != NULL)
new_initAction(ASKFIRST, SHELL, secondConsole); new_initAction(ASKFIRST, LOGIN_SHELL, secondConsole);
if (thirdConsole != NULL) if (thirdConsole != NULL)
new_initAction(ASKFIRST, SHELL, thirdConsole); new_initAction(ASKFIRST, LOGIN_SHELL, thirdConsole);
if (fourthConsole != NULL) if (fourthConsole != NULL)
new_initAction(ASKFIRST, SHELL, fourthConsole); new_initAction(ASKFIRST, LOGIN_SHELL, fourthConsole);
/* Start a shell on tty1 */ /* Start a shell on tty1 */
new_initAction(RESPAWN, SHELL, console); new_initAction(RESPAWN, LOGIN_SHELL, console);
} else { } else {
/* Not in single user mode -- see what inittab says */ /* Not in single user mode -- see what inittab says */

21
init/init.c
View File

@ -124,7 +124,8 @@ static const int RB_AUTOBOOT = 0x01234567;
#define VT_LOG "/dev/tty5" /* Virtual console */ #define VT_LOG "/dev/tty5" /* Virtual console */
#define SERIAL_CON0 "/dev/ttyS0" /* Primary serial console */ #define SERIAL_CON0 "/dev/ttyS0" /* Primary serial console */
#define SERIAL_CON1 "/dev/ttyS1" /* 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 */ #define INITTAB "/etc/inittab" /* inittab file location */
#ifndef INIT_SCRIPT #ifndef INIT_SCRIPT
#define INIT_SCRIPT "/etc/init.d/rcS" /* Default sysinit 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, termType,
"HOME=/", "HOME=/",
"PATH=/usr/bin:/bin:/usr/sbin:/sbin", "PATH=/usr/bin:/bin:/usr/sbin:/sbin",
"SHELL=/bin/sh", "SHELL=" SHELL,
"USER=root", "USER=root",
NULL NULL
}; };
@ -782,16 +783,16 @@ static void parse_inittab(void)
/* Umount all filesystems on halt/reboot */ /* Umount all filesystems on halt/reboot */
new_initAction(SHUTDOWN, "/bin/umount -a -r", console); new_initAction(SHUTDOWN, "/bin/umount -a -r", console);
/* Askfirst shell on tty1 */ /* Askfirst shell on tty1 */
new_initAction(ASKFIRST, SHELL, console); new_initAction(ASKFIRST, LOGIN_SHELL, console);
/* Askfirst shell on tty2 */ /* Askfirst shell on tty2 */
if (secondConsole != NULL) if (secondConsole != NULL)
new_initAction(ASKFIRST, SHELL, secondConsole); new_initAction(ASKFIRST, LOGIN_SHELL, secondConsole);
/* Askfirst shell on tty3 */ /* Askfirst shell on tty3 */
if (thirdConsole != NULL) if (thirdConsole != NULL)
new_initAction(ASKFIRST, SHELL, thirdConsole); new_initAction(ASKFIRST, LOGIN_SHELL, thirdConsole);
/* Askfirst shell on tty4 */ /* Askfirst shell on tty4 */
if (fourthConsole != NULL) if (fourthConsole != NULL)
new_initAction(ASKFIRST, SHELL, fourthConsole); new_initAction(ASKFIRST, LOGIN_SHELL, fourthConsole);
/* sysinit */ /* sysinit */
new_initAction(SYSINIT, INIT_SCRIPT, console); 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"))) { !strcmp(argv[1], "-s") || !strcmp(argv[1], "1"))) {
/* Ask first then start a shell on tty2-4 */ /* Ask first then start a shell on tty2-4 */
if (secondConsole != NULL) if (secondConsole != NULL)
new_initAction(ASKFIRST, SHELL, secondConsole); new_initAction(ASKFIRST, LOGIN_SHELL, secondConsole);
if (thirdConsole != NULL) if (thirdConsole != NULL)
new_initAction(ASKFIRST, SHELL, thirdConsole); new_initAction(ASKFIRST, LOGIN_SHELL, thirdConsole);
if (fourthConsole != NULL) if (fourthConsole != NULL)
new_initAction(ASKFIRST, SHELL, fourthConsole); new_initAction(ASKFIRST, LOGIN_SHELL, fourthConsole);
/* Start a shell on tty1 */ /* Start a shell on tty1 */
new_initAction(RESPAWN, SHELL, console); new_initAction(RESPAWN, LOGIN_SHELL, console);
} else { } else {
/* Not in single user mode -- see what inittab says */ /* Not in single user mode -- see what inittab says */