summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2024-05-15 14:15:37 +0100
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-05-16 07:00:39 +0000
commit676d2cbd5e9e1fcb1cdd9cb3fbbb71978922946e (patch)
treeabc4e18fdb2512460b9a8d2ee8c24ea03acb5f6a /python
parent8c98231d62cd033800707c05c98a18356d20f338 (diff)
downloadvyos-1x-676d2cbd5e9e1fcb1cdd9cb3fbbb71978922946e.tar.gz
vyos-1x-676d2cbd5e9e1fcb1cdd9cb3fbbb71978922946e.zip
op mode: T3355: remove the mention of legacy non-image installations
They were never supported by VyOS, that was just for very old systens upgraded from Vyatta Core (cherry picked from commit d8223d50ab627d2b58e14101891bf8ffb8111234)
Diffstat (limited to 'python')
-rw-r--r--python/vyos/version.py10
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