diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-05-16 10:11:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-16 10:11:11 +0200 |
| commit | ce2facdb0e3d5a2f226bb9edc946cbf0ea4f06b9 (patch) | |
| tree | abc4e18fdb2512460b9a8d2ee8c24ea03acb5f6a | |
| parent | 8c98231d62cd033800707c05c98a18356d20f338 (diff) | |
| parent | 676d2cbd5e9e1fcb1cdd9cb3fbbb71978922946e (diff) | |
| download | vyos-1x-ce2facdb0e3d5a2f226bb9edc946cbf0ea4f06b9.tar.gz vyos-1x-ce2facdb0e3d5a2f226bb9edc946cbf0ea4f06b9.zip | |
Merge pull request #3461 from vyos/mergify/bp/sagitta/pr-3457
op mode: T3355: remove the mention of legacy non-image installations (backport #3457)
| -rw-r--r-- | python/vyos/version.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/python/vyos/version.py b/python/vyos/version.py index b5ed2705b..47a10e201 100644 --- a/python/vyos/version.py +++ b/python/vyos/version.py @@ -81,16 +81,14 @@ def get_full_version_data(fname=version_file): else: version_data['system_type'] = f"{hypervisor} guest" - # Get boot type, it can be livecd, installed image, or, possible, a system installed - # via legacy "install system" mechanism + # Get boot type, it can be livecd or installed image # In installed images, the squashfs image file is named after its image version, # while on livecd it's just "filesystem.squashfs", that's how we tell a livecd boot # from an installed image - boot_via = "installed image" - if run(""" grep -e '^overlay.*/filesystem.squashfs' /proc/mounts >/dev/null""") == 0: + if run(""" grep -e '^overlay.*/filesystem.squashfs' /proc/mounts >/dev/null """) == 0: boot_via = "livecd" - elif run(""" grep '^overlay /' /proc/mounts >/dev/null """) != 0: - boot_via = "legacy non-image installation" + else: + boot_via = "installed image" version_data['boot_via'] = boot_via # Get hardware details from DMI |