summaryrefslogtreecommitdiff
path: root/python/vyos/utils/kernel.py
diff options
context:
space:
mode:
Diffstat (limited to 'python/vyos/utils/kernel.py')
-rw-r--r--python/vyos/utils/kernel.py7
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'),