tty.c: Let fallback shells be consoles, improved job control etc.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2015-02-26 18:57:17 +01:00
1 parent 335f09726f
commit aff11d83d8
2 files changed
+4 -2

No files matched your search

+2 -2
View File
@@ -39,14 +39,14 @@
# define CONSOLE _PATH_CONSOLE # define CONSOLE _PATH_CONSOLE
# define SETUP_DEVFS "/sbin/mdev -s" # define SETUP_DEVFS "/sbin/mdev -s"
# define GETTY "/sbin/getty -L" # define GETTY "/sbin/getty -L"
# define GETTY_BUSYBOX # define GETTY_BUSYBOX /* Tell tty.c about the getty argument order */
# define BAUDRATE 115200 # define BAUDRATE 115200
# define RUNLEVEL 2 # define RUNLEVEL 2
#else /* Debian/Ubuntu based distributions */ #else /* Debian/Ubuntu based distributions */
# define CONSOLE "/dev/tty1" # define CONSOLE "/dev/tty1"
# define SETUP_DEVFS "/sbin/udevd --daemon" # define SETUP_DEVFS "/sbin/udevd --daemon"
# define GETTY "/sbin/getty -8" # define GETTY "/sbin/getty -8"
# define GETTY_AGETTY # define GETTY_AGETTY /* Tell tty.c about the getty argument order */
# define BAUDRATE 38400 # define BAUDRATE 38400
# define RUNLEVEL 2 # define RUNLEVEL 2
# define RANDOMSEED "/var/lib/urandom/random-seed" # define RANDOMSEED "/var/lib/urandom/random-seed"
+2
View File
@@ -145,9 +145,11 @@ void tty_start(finit_tty_t *tty)
snprintf(line, sizeof(line), "%s %d %s %s", GETTY, tty->baud, tty->name, tty->term ?: ""); snprintf(line, sizeof(line), "%s %d %s %s", GETTY, tty->baud, tty->name, tty->term ?: "");
#else #else
strlcpy(line, FALLBACK_SHELL, sizeof(line)); strlcpy(line, FALLBACK_SHELL, sizeof(line));
is_console = 1;
#endif #endif
} else { } else {
strlcpy(line, tty->name, sizeof(line)); strlcpy(line, tty->name, sizeof(line));
is_console = 1;
} }
cmd = strtok(line, " "); cmd = strtok(line, " ");
args[i++] = basename(cmd); args[i++] = basename(cmd);