Merge pull request #3445 from jestabro/addendum-fix-boot-console

image-tools: T6176: addendum to fixes for boot console
vyos · May 11, 2024 · ef8ec78 · ef8ec78
2 parents d0bfe6d + 0eb09b8
commit ef8ec78
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/python/vyos/system/compat.py b/python/vyos/system/compat.py
@@ -247,6 +247,10 @@ def update_version_list(root_dir: str = '') -> list[dict]:
     menu_entries = parse_menuentries(grub_cfg_main)
     menu_versions = find_versions(menu_entries)
 
+    # remove deprecated console-type ttyUSB
+    menu_entries = list(filter(lambda x: x.get('console_type') != 'ttyUSB',
+                               menu_entries))
+
     # get list of versions added/removed by image-tools
     current_versions = grub.version_list(root_dir)
 
@@ -262,9 +266,7 @@ def update_version_list(root_dir: str = '') -> list[dict]:
     add = list(set(current_versions) - set(menu_versions))
     for ver in add:
         last = menu_entries[0].get('version')
-        # copy legacy format of menu entries; ignore deprecated ttyUSB
-        new = deepcopy(list(filter(lambda x: (x.get('version') == last and
-                                              x.get('console_type') != 'ttyUSB'),
+        new = deepcopy(list(filter(lambda x: x.get('version') == last,
                                    menu_entries)))
         for e in new:
             boot_opts = grub.get_boot_opts(ver)

diff --git a/src/op_mode/image_installer.py b/src/op_mode/image_installer.py
@@ -725,7 +725,7 @@ def install_image() -> None:
 
     # ask for default console
     console_type: str = ask_input(MSG_INPUT_CONSOLE_TYPE,
-                                  default='K',
+                                  default=console_hint(),
                                   valid_responses=['K', 'S'])
     console_dict: dict[str, str] = {'K': 'tty', 'S': 'ttyS'}