nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-01-21 07:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

container script: Must convert env. var. string to a Path object

Browse Source 
Reviewed-by: Veiko Aasa <veiko17@disroot.org>
This commit is contained in:
fliu 2021-03-29 02:42:56 +00:00 committed by Veiko Aasa
parent 968726d152
commit 26b6bbcb52
No known key found for this signature in database
GPG Key ID: 478539CAE680674E
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
container
View File

@ -383,11 +383,11 @@ def _verify_dependencies():
def _get_systemd_nspawn_version():
"""Retrieve and store systemd-nspawn version (same as systemd)."""
try:
process = subprocess.run(['systemd', '--version'], stdout=subprocess.PIPE,
check=True)
process = subprocess.run(['systemd', '--version'],
stdout=subprocess.PIPE, check=True)
except FileNotFoundError:
process = subprocess.run(['/usr/lib/systemd/systemd', '--version'], stdout=subprocess.PIPE,
check=True)
process = subprocess.run(['/usr/lib/systemd/systemd', '--version'],
stdout=subprocess.PIPE, check=True)
global systemd_version
systemd_version = float(process.stdout.decode().split()[1])
@ -484,7 +484,8 @@ def _get_overlay_folder(distribution):
"""Return the writable folder that should be exposed into container."""
default_data_dir = pathlib.Path.home() / '.local' / 'share'
data_folder = os.environ.get('XDG_DATA_HOME', default_data_dir)
folder = data_folder / 'freedombox-container' / 'overlay' / distribution
folder = pathlib.Path(data_folder) / \
'freedombox-container' / 'overlay' / distribution
return folder.resolve()