diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-17 15:36:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-17 15:36:43 +0200 |
| commit | d1b6b40891d84dca5c5b589e6708cd1452739e0f (patch) | |
| tree | 850e87b4fe1c0a07b1965f5dcd65a32815594683 | |
| parent | e53dd75a149e891043a875bb6269fe22da99f586 (diff) | |
| parent | 783edc98f82f8718ccc856976d9a8f59bc6822e9 (diff) | |
| download | vyos-1x-d1b6b40891d84dca5c5b589e6708cd1452739e0f.tar.gz vyos-1x-d1b6b40891d84dca5c5b589e6708cd1452739e0f.zip | |
Merge pull request #3474 from HollyGurza/T6354
T6354: Get rid of the custom boot type check in version.py
| -rw-r--r-- | python/vyos/version.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/vyos/version.py b/python/vyos/version.py index 47a10e201..86e96d0ec 100644 --- a/python/vyos/version.py +++ b/python/vyos/version.py @@ -33,11 +33,11 @@ import os import requests import vyos.defaults +from vyos.system.image import is_live_boot from vyos.utils.file import read_file from vyos.utils.file import read_json from vyos.utils.process import popen -from vyos.utils.process import run from vyos.utils.process import DEVNULL version_file = os.path.join(vyos.defaults.directories['data'], 'version.json') @@ -85,7 +85,7 @@ def get_full_version_data(fname=version_file): # 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 - if run(""" grep -e '^overlay.*/filesystem.squashfs' /proc/mounts >/dev/null """) == 0: + if is_live_boot(): boot_via = "livecd" else: boot_via = "installed image" |