summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2024-01-24 21:15:54 -0600
committerJohn Estabrook <jestabro@vyos.io>2024-01-24 22:17:54 -0600
commitd603b1e3b2d0edb5a996b687236c12b50ad60259 (patch)
tree73b2c3ad791cfd779ce7cc8a00bec8a274fc1061
parentd736a9b70ca897bdf1e0237b64ab5c7eb958b520 (diff)
downloadvyos-1x-d603b1e3b2d0edb5a996b687236c12b50ad60259.tar.gz
vyos-1x-d603b1e3b2d0edb5a996b687236c12b50ad60259.zip
image-tools: T5983: fix regression in prune_vyos_versions
-rw-r--r--python/vyos/system/compat.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/python/vyos/system/compat.py b/python/vyos/system/compat.py
index 626ce0067..37b834ad6 100644
--- a/python/vyos/system/compat.py
+++ b/python/vyos/system/compat.py
@@ -170,9 +170,12 @@ def prune_vyos_versions(root_dir: str = '') -> None:
if not root_dir:
root_dir = disk.find_persistence()
- for version in grub.version_list():
+ version_files = Path(f'{root_dir}/{grub.GRUB_DIR_VYOS_VERS}').glob('*.cfg')
+
+ for file in version_files:
+ version = Path(file).stem
if not Path(f'{root_dir}/boot/{version}').is_dir():
- grub.version_del(version)
+ grub.version_del(version, root_dir)
def update_cfg_ver(root_dir:str = '') -> int: