]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
terminal-util: do not query kernel cmdline for pty size
authorMike Yuan <me@yhndnzj.com>
Fri, 9 Aug 2024 15:33:39 +0000 (17:33 +0200)
committerLuca Boccassi <luca.boccassi@gmail.com>
Sat, 10 Aug 2024 11:01:56 +0000 (13:01 +0200)
This is pointless and noisy even for debug level.

src/basic/terminal-util.c

index 1f5204cca5568c1f1db697366e610b0713af9ada..60883201869a5b288d0b9dbf76b1b65e2c2515b2 100644 (file)
@@ -980,8 +980,11 @@ int proc_cmdline_tty_size(const char *tty, unsigned *ret_rows, unsigned *ret_col
                 return 0;
 
         tty = skip_dev_prefix(tty);
+        if (path_startswith(tty, "pts/"))
+                return -EMEDIUMTYPE;
         if (!in_charset(tty, ALPHANUMERICAL))
-                return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "%s contains non-alphanumeric characters", tty);
+                return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
+                                       "TTY name '%s' contains non-alphanumeric characters, not searching kernel cmdline for size.", tty);
 
         rowskey = strjoin("systemd.tty.rows.", tty);
         if (!rowskey)