summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-02-14 19:57:18 +0100
committerLennart Poettering <lennart@poettering.net>2011-02-14 19:57:18 +0100
commit6a3b1508f7a9c8ecf712beb44baa13f252f0d3d8 (patch)
treed257d7b7aa2a95132a7abf4e89ee3dfc9e0135a8 /src/main.c
parent079a09fbf79050c0794bac0f87d3600ffd5b9db2 (diff)
getty: don't parse console= anymore, use /sys/class/tty/console/active instead
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/src/main.c b/src/main.c
index d1eeffb12e..d9dd0ac492 100644
--- a/src/main.c
+++ b/src/main.c
@@ -72,7 +72,6 @@ static bool arg_sysv_console = true;
#endif
static bool arg_mount_auto = true;
static bool arg_swap_auto = true;
-static char *arg_console = NULL;
static char **arg_default_controllers = NULL;
static FILE* serialization = NULL;
@@ -329,26 +328,6 @@ static int parse_proc_cmdline_word(const char *word) {
"systemd.log_color=0|1 Highlight important log messages\n"
"systemd.log_location=0|1 Include code location in log messages\n");
- } else if (startswith(word, "console=")) {
- const char *k;
- size_t l;
- char *w = NULL;
-
- k = word + 8;
- l = strcspn(k, ",");
-
- /* Ignore the console setting if set to a VT */
- if (l < 4 ||
- !startswith(k, "tty") ||
- k[3+strspn(k+3, "0123456789")] != 0) {
-
- if (!(w = strndup(k, l)))
- return -ENOMEM;
- }
-
- free(arg_console);
- arg_console = w;
-
} else if (streq(word, "quiet")) {
arg_show_status = false;
#ifdef HAVE_SYSV_COMPAT
@@ -1094,9 +1073,6 @@ int main(int argc, char *argv[]) {
if (dual_timestamp_is_set(&initrd_timestamp))
m->initrd_timestamp = initrd_timestamp;
- if (arg_console)
- manager_set_console(m, arg_console);
-
if (arg_default_controllers)
manager_set_default_controllers(m, arg_default_controllers);
@@ -1221,7 +1197,6 @@ finish:
manager_free(m);
free(arg_default_unit);
- free(arg_console);
strv_free(arg_default_controllers);
dbus_shutdown();