StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

network: run `netplan apply` without snap env 

netplan isn't staged in the snap, and the environment variables being
passed around don't help it.
This commit is contained in:
Dan Bungert 2023-03-29 13:09:18 -06:00
parent bc33062e9b
commit 2bfff57f41
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
subiquitycore/controllers/network.py
View File

@ -46,6 +46,7 @@ from subiquitycore.ui.views.network import (
)
from subiquitycore.utils import (
arun_command,
orig_environ,
run_command,
)
@ -358,9 +359,13 @@ class BaseNetworkController(BaseController):
'systemd-networkd.service',
'systemd-networkd.socket'],
check=True)
env = orig_environ(None)
try:
await arun_command(['netplan', 'apply'], check=True)
except subprocess.CalledProcessError:
await arun_command(['netplan', 'apply'],
env=env, check=True)
except subprocess.CalledProcessError as cpe:
log.debug('CalledProcessError: '
f'stdout[{cpe.stdout}] stderr[{cpe.stderr}]')
error("apply")
raise
if devs_to_down or devs_to_delete: