wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-01 13:33:09 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add support for 'console' as compat alias to '@console'"

Browse Source 
Because we want to reserve @console for going dumpster diving in
/sys/class/tty/console/active and 'console' to mean the literal
/dev/console

This reverts commit 217df432d6.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson
2020-07-01 13:10:10 +02:00
parent fdead062cd
commit 16e401f253
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tty.c
+3 -3
View File
@@ -161,7 +161,7 @@ int tty_register(char *line, struct rlimit rlimit[], char *file)
if ((!cmd && !dev) || (cmd && !dev)) {
if (args[i][0] == '[')
runlevels = line;
if (!strcmp(args[i], "@console") || !strcmp(args[i], "console"))
if (!strcmp(args[i], "@console"))
dev = args[i];
if (!strncmp(args[i], "/dev", 4))
dev = args[i];
@@ -197,7 +197,7 @@ int tty_register(char *line, struct rlimit rlimit[], char *file)
}
/* Auto-detect serial console, for embedded devices mostly */
if (!strcmp(dev, "@console") || !strcmp(dev, "console")) {
if (!strcmp(dev, "@console")) {
FILE *fp;
fp = fopen("/sys/class/tty/console/active", "r");
@@ -262,7 +262,7 @@ again:
char *arg = args[i];
/* Replace @console with actual device */
if (arg && (!strcmp(arg, "@console") || !strcmp(arg, "console")))
if (arg && !strcmp(arg, "@console"))
arg = dev;
if (arg)
entry->args[j++] = strdup(arg);