Skip to content

Commit

Permalink
T6354: Get rid of the custom boot type check in version.py
Browse files Browse the repository at this point in the history
(cherry picked from commit 783edc9)
  • Loading branch information
HollyGurza authored and mergify[bot] committed May 17, 2024
1 parent badc6a2 commit a901ad5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions python/vyos/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@

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')
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit a901ad5

Please sign in to comment.