Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qvm-template: Eliminate use of lsb_release

Browse Source
This commit is contained in:
WillyPillow 2020-08-30 01:58:25 +08:00
parent 2e06e300e6
commit 32a38c7183
No known key found for this signature in database
GPG Key ID: 3839E194B1415A9C
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qubesadmin/tools/qvm_template.py
View File

@ -41,8 +41,16 @@ def qubes_release() -> str:
with open('/usr/share/qubes/marker-vm', 'r') as fd: with open('/usr/share/qubes/marker-vm', 'r') as fd:
# Get last line (in the format `x.x`) # Get last line (in the format `x.x`)
return fd.readlines()[-1].strip() return fd.readlines()[-1].strip()
return subprocess.check_output(['lsb_release', '-sr'], with open('/etc/os-release', 'r') as fd:
encoding='UTF-8').strip() for line in fd:
line = line.strip()
if not line or line[0] == '#':
continue
key, val = line.split('=', 1)
if key != 'VERSION_ID':
continue
val = val.strip('\'"') # strip possible quotes
return val
def parser_gen() -> argparse.ArgumentParser: def parser_gen() -> argparse.ArgumentParser:
"""Generate argument parser for the application.""" """Generate argument parser for the application."""