Merge pull request #1878 from ogayot/console-conf-network-crash

network: ensure we pass tasks to asyncio.wait
canonical · Dec 12, 2023 · ea909d1 · ea909d1
2 parents 93ab4f9 + 0b7a4d1
commit ea909d1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/subiquity/server/controllers/network.py b/subiquity/server/controllers/network.py
@@ -169,7 +169,8 @@ async def wait_for_initial_config(self, context):
         with context.child("wait_dhcp"):
             try:
                 await asyncio.wait_for(
-                    asyncio.wait({e.wait() for e in dhcp_events}), 10
+                    asyncio.wait({asyncio.create_task(e.wait()) for e in dhcp_events}),
+                    10,
                 )
             except asyncio.TimeoutError:
                 pass

diff --git a/subiquitycore/controllers/network.py b/subiquitycore/controllers/network.py
@@ -391,7 +391,9 @@ def error(stage):
             return
 
         try:
-            await asyncio.wait_for(asyncio.wait({e.wait() for e in dhcp_events}), 10)
+            await asyncio.wait_for(
+                asyncio.wait({asyncio.create_task(e.wait()) for e in dhcp_events}), 10
+            )
         except asyncio.TimeoutError:
             pass