From: Mike Yuan <me@yhndnzj.com>
Date: Fri, 9 Aug 2024 15:33:39 +0000 (+0200)
Subject: terminal-util: do not query kernel cmdline for pty size
X-Git-Tag: v257-rc1~716
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=7036dd8b27b1ccca1f76723814145f17283d2656;p=systemd%2F.git

terminal-util: do not query kernel cmdline for pty size

This is pointless and noisy even for debug level.
---

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 1f5204cca5..6088320186 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -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)