diff options
| author | John Estabrook <jestabro@vyos.io> | 2026-08-27 07:21:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-08-27 07:21:32 -0500 |
| commit | e956c125a2d9669ea5163bcc80206ab27ce88ee3 (patch) | |
| tree | 5c3f4f38af461a4dedb296e2df31afb1da28d16e /python | |
| parent | c9822d15100aa5a5d3d0d65cb3e69fb40830102a (diff) | |
| parent | c5e3e7494350fad09d687d81e7da332c5b46bac5 (diff) | |
| download | vyos-1x-e956c125a2d9669ea5163bcc80206ab27ce88ee3.tar.gz vyos-1x-e956c125a2d9669ea5163bcc80206ab27ce88ee3.zip | |
Merge pull request #5428 from jestabro/fix-regression-console-selection
T9244: fix regression in setting console type on install
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/utils/kernel.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/python/vyos/utils/kernel.py b/python/vyos/utils/kernel.py index 72c7413cf..69574cefc 100644 --- a/python/vyos/utils/kernel.py +++ b/python/vyos/utils/kernel.py @@ -165,13 +165,14 @@ def get_kernel_serial_console() -> Tuple[Optional[str], Optional[str], Optional[ command line which was used during system boot. """ import re + from vyos.utils.file import read_file cmdline_console_re = re.compile( - r'(?P<console_type>tty(?:S|AMA))(?P<console_num>\d+),(?P<console_speed>\d+)' + r'(?:^|\s)console=(?P<console_type>tty(?:S|AMA))(?P<console_num>\d+),(?P<console_speed>\d+)(?=\s|$)' ) - console_value = get_kernel_boot_arg('console') or '' - if m := cmdline_console_re.search(console_value): + kernel_cmdline = read_file('/proc/cmdline') + if m := cmdline_console_re.search(kernel_cmdline): return ( m.group('console_type'), m.group('console_num'), |