diff options
| author | John Estabrook <jestabro@vyos.io> | 2026-08-26 19:09:10 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2026-08-26 20:27:28 -0500 |
| commit | c5e3e7494350fad09d687d81e7da332c5b46bac5 (patch) | |
| tree | 5c3f4f38af461a4dedb296e2df31afb1da28d16e /python | |
| parent | c9822d15100aa5a5d3d0d65cb3e69fb40830102a (diff) | |
| download | vyos-1x-c5e3e7494350fad09d687d81e7da332c5b46bac5.tar.gz vyos-1x-c5e3e7494350fad09d687d81e7da332c5b46bac5.zip | |
T9244: fix regression in setting console type on install
The introduction of util get_kernel_boot_arg() has many uses, however,
it is not appropriate for use in get_kernel_serial_console: since it
searches right to left, it picks up an incorrect and incomplete entry;
consequently get_kernel_serial_console returns a None tuple, which voids
selection of console type on install.
Restore original implementation of get_kernel_serial_console.
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'), |