units: On Debian Runlevel 2, 3, 4 and 5 are multi-user

[elogind.git] / src / util.c

diff --git a/src/util.c b/src/util.c
index a09b704ffebd1e2195a17b6b4a95fdab717afdb2..0cd1fd30df49f7f0117aad847f6b55cb6b2f4d57 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -1917,9 +1917,9 @@ int reset_terminal(int fd) {
 
         assert(fd >= 0);
 
-        /* First, unlock termios */
-        zero(termios);
-        ioctl(fd, TIOCSLCKTRMIOS, &termios);
+        /* We leave locked terminal attributes untouched, so that
+         * Plymouth may set whatever it wants to set, and we don't
+         * interfere with that. */
 
         /* Disable exclusive mode, just in case */
         ioctl(fd, TIOCNXCL);
@@ -2988,7 +2988,7 @@ int columns(void) {
                 struct winsize ws;
                 zero(ws);
 
-                if (ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) >= 0)
+                if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) >= 0)
                         parsed_columns = ws.ws_col;
         }