summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorkhramshinr <khramshinr@gmail.com>2024-05-17 15:22:16 +0600
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-05-17 13:37:47 +0000
commita901ad58c2bfef4c52da31e67404f63c99085e58 (patch)
tree5e7b8a9597d2f91fe0eeba76ffa27fc94e946c72 /python
parentbadc6a27571b4af04f80cda4bae6931ed9d8c286 (diff)
downloadvyos-1x-a901ad58c2bfef4c52da31e67404f63c99085e58.tar.gz
vyos-1x-a901ad58c2bfef4c52da31e67404f63c99085e58.zip
T6354: Get rid of the custom boot type check in version.py
(cherry picked from commit 783edc98f82f8718ccc856976d9a8f59bc6822e9)
Diffstat (limited to 'python')
-rw-r--r--python/vyos/version.py4
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"