summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2023-12-18 18:12:51 +0000
committerGitHub <noreply@github.com>2023-12-18 18:12:51 +0000
commitf2cd94167433903b803157fefba1ee9e00312f3b (patch)
tree805c70e9da670598a042bde4e9efe78a975f5ae0 /python
parent7036c761e74bcd48e3ba714dec4545208ee0e313 (diff)
parentf19b2acb34e77baeae34aa156ea96d0580a61725 (diff)
downloadvyos-1x-f2cd94167433903b803157fefba1ee9e00312f3b.tar.gz
vyos-1x-f2cd94167433903b803157fefba1ee9e00312f3b.zip
Merge pull request #2649 from jestabro/image-version-order
image-tools: T5831: show system image reverse ordered by date
Diffstat (limited to 'python')
-rw-r--r--python/vyos/system/grub.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/python/vyos/system/grub.py b/python/vyos/system/grub.py
index 2692aaea1..61a9c7749 100644
--- a/python/vyos/system/grub.py
+++ b/python/vyos/system/grub.py
@@ -19,7 +19,7 @@ from typing import Union
from uuid import uuid5, NAMESPACE_URL, UUID
from vyos.template import render
-from vyos.utils.process import cmd
+from vyos.utils.process import cmd, rc_cmd
from vyos.system import disk
# Define variables
@@ -131,14 +131,22 @@ def version_list(root_dir: str = '') -> list[str]:
Returns:
list: A list with versions names
+
+ N.B. coreutils stat reports st_birthtime, but not available in
+ Path.stat()/os.stat()
"""
if not root_dir:
root_dir = disk.find_persistence()
versions_files = Path(f'{root_dir}/{GRUB_DIR_VYOS_VERS}').glob('*.cfg')
- versions_list: list[str] = []
+ versions_order: dict[str, int] = {}
for file in versions_files:
- versions_list.append(file.stem)
- versions_list.sort(reverse=True)
+ p = Path(root_dir).joinpath('boot').joinpath(file.stem)
+ command = f'stat -c %W {p.as_posix()}'
+ rc, out = rc_cmd(command)
+ if rc == 0:
+ versions_order[file.stem] = int(out)
+ versions_order = sorted(versions_order, key=versions_order.get, reverse=True)
+ versions_list: list[str] = list(versions_order)
return versions_list