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

log applying network config via context

This commit is contained in:
Michael Hudson-Doyle 2019-12-19 23:17:05 +13:00
parent 1f1937b03f
commit 4be25fc78f
1 changed files with 77 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
subiquitycore/controllers/network.py
View File

@ -348,8 +348,7 @@ class NetworkController(BaseController):
self.model.parse_netplan_configs(self.root)
async def _apply_config(self, silent):
log.debug("apply_config silent=%s", silent)
with self.context.child("apply_config", "silent={}".format(silent)):
devs_to_delete = []
devs_to_down = []
dhcp_device_versions = []
@ -360,7 +359,8 @@ class NetworkController(BaseController):
if dev.dhcp_enabled(v):
if not silent:
dev.set_dhcp_state(v, "PENDING")
self.network_event_receiver.update_link(dev.ifindex)
self.network_event_receiver.update_link(
dev.ifindex)
else:
dev.set_dhcp_state(v, "RECONFIGURE")
dev.dhcp_events[v] = e = asyncio.Event()
@ -389,7 +389,8 @@ class NetworkController(BaseController):
# If netplan appears to be installed, run generate to at
# least test that what we wrote is acceptable to netplan.
await arun_command(
['netplan', 'generate', '--root', self.root], check=True)
['netplan', 'generate', '--root', self.root],
check=True)
else:
if devs_to_down or devs_to_delete:
try: