From f212ac125fb0f8dda6ed9ac50b0c315dd4f58974 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 14 Feb 2011 18:56:51 +0100
Subject: getty: do not auto-spawn getty's on VC ttys if console=ttyN is used

https://bugzilla.redhat.com/show_bug.cgi?id=676885
---
 src/util.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'src/util.c')

diff --git a/src/util.c b/src/util.c
index e78063c5aa..d0c903993c 100644
--- a/src/util.c
+++ b/src/util.c
@@ -3549,6 +3549,16 @@ void filter_environ(const char *prefix) {
         environ[j] = NULL;
 }
 
+bool tty_is_vc(const char *tty) {
+        assert(tty);
+
+        if (startswith(tty, "/dev/"))
+                tty += 5;
+
+        return startswith(tty, "tty") &&
+                tty[3] >= '0' && tty[3] <= '9';
+}
+
 const char *default_term_for_tty(const char *tty) {
         char *active = NULL;
         const char *term;
@@ -3566,9 +3576,7 @@ const char *default_term_for_tty(const char *tty) {
                         tty = active;
                 }
 
-        term = (startswith(tty, "tty") &&
-                tty[3] >= '0' && tty[3] <= '9') ? "TERM=linux" : "TERM=vt100";
-
+        term = tty_is_vc(tty) ? "TERM=linux" : "TERM=vt100";
         free(active);
 
         return term;
-- 
cgit v1.2.3-54-g00ecf