diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-11 07:20:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-11 07:20:52 +0200 |
| commit | ef8ec78ac2ce2df0c7e7b15f94ad18d966ce6d39 (patch) | |
| tree | ef4cfb19dd19405d8810621bed2da7e83cbabf13 | |
| parent | d0bfe6ddb92f4a0e3d19c26eb475cbc42f946480 (diff) | |
| parent | 0eb09b81f763a62684a7be905267f081f9d6aeb1 (diff) | |
| download | vyos-1x-ef8ec78ac2ce2df0c7e7b15f94ad18d966ce6d39.tar.gz vyos-1x-ef8ec78ac2ce2df0c7e7b15f94ad18d966ce6d39.zip | |
Merge pull request #3445 from jestabro/addendum-fix-boot-console
image-tools: T6176: addendum to fixes for boot console
| -rw-r--r-- | python/vyos/system/compat.py | 8 | ||||
| -rwxr-xr-x | src/op_mode/image_installer.py | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/python/vyos/system/compat.py b/python/vyos/system/compat.py index 94e40d268..d35bddea2 100644 --- 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 index 22bdc26fb..0d2d7076c 100755 --- 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'} |