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

network: reset SNAP when calling netplan in dry-run mode

This commit is contained in:
J-P Nurmi 2023-02-08 17:21:44 +01:00
parent 7e2ceb9f94
commit 10833a848f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
subiquitycore/controllers/network.py
View File

@ -15,6 +15,7 @@
import abc import abc
import asyncio import asyncio
import contextlib
import logging import logging
import os import os
import subprocess import subprocess
@ -294,10 +295,15 @@ class BaseNetworkController(BaseController):
if os.path.exists('/lib/netplan/generate'): if os.path.exists('/lib/netplan/generate'):
# If netplan appears to be installed, run generate to # If netplan appears to be installed, run generate to
# at least test that what we wrote is acceptable to # at least test that what we wrote is acceptable to
# netplan. # netplan but clear the SNAP environment variable to
# avoid that netplan thinks its running in a snap and
# tries to call netplan over the system bus.
env = os.environ.copy()
with contextlib.suppress(KeyError):
del env['SNAP']
await arun_command( await arun_command(
['netplan', 'generate', '--root', self.root], ['netplan', 'generate', '--root', self.root],
check=True) check=True, env=env)
else: else:
if devs_to_down or devs_to_delete: if devs_to_down or devs_to_delete:
try: try: