picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

getty-generator: Enable getty on all active serial consoles.

Browse source 
This enables a getty on active kernel consoles even when they are not
the last one specified on the kernel command line and mapped to
/dev/console. Now the order "console=ttyS0 console=tty0" works in
addition to "console=tty0 console=ttyS0".
This commit is contained in:
Michael Marineau 2013-08-16 20:28:24 -04:00 committed by Zbigniew Jędrzejewski-Szmek
parent 176cceb051
commit 39f0570d6e
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/getty-generator/getty-generator.c
View file

@ -122,33 +122,42 @@ int main(int argc, char *argv[]) {
}
if (read_one_line_file("/sys/class/tty/console/active", &active) >= 0) {
const char *tty;
char *w, *state;
size_t l;
tty = strrchr(active, ' ');
if (tty)
tty ++;
else
tty = active;
/* Automatically add in a serial getty on the kernel
* console */
if (isempty(tty) || tty_is_vc(tty))
free(active);
else {
/* Automatically add in a serial getty on all active
* kernel consoles */
FOREACH_WORD(w, l, active, state) {
char *tty;
int k;
tty = strndup(w, l);
if (!tty) {
log_oom();
free(active);
r = EXIT_FAILURE;
goto finish;
}
if (isempty(tty) || tty_is_vc(tty)) {
free(tty);
continue;
}
/* We assume that gettys on virtual terminals are
* started via manual configuration and do this magic
* only for non-VC terminals. */
k = add_serial_getty(tty);
free(active);
if (k < 0) {
free(tty);
free(active);
r = EXIT_FAILURE;
goto finish;
}
}
free(active);
}
/* Automatically add in a serial getty on the first