Skip to content

Commit

Permalink
kernel: fix install hang with autoinstall + kernel
Browse files Browse the repository at this point in the history
  • Loading branch information
dbungert committed Jan 27, 2025
1 parent 1adc385 commit b26d620
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
7 changes: 7 additions & 0 deletions subiquity/server/controllers/kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@ class KernelController(NonInteractiveController):

def start(self):
if self.model.metapkg_name is not None:
# if we're exiting early here, we have made a decision on the
# kernel already - probably autoinstall - and are skipping the
# bridge_kernel logic. We must still broadcast
# BRIDGE_KERNEL_DECIDED though, otherwise we'll hang in
# curtin_install before curthooks waiting for
# bridge_kernel_decided.set().
self.app.hub.broadcast(InstallerChannels.BRIDGE_KERNEL_DECIDED)
# if we have set the desired kernel already, use that.
return
# the ISO may have been configured to tell us what kernel to use
Expand Down
2 changes: 1 addition & 1 deletion subiquity/server/controllers/tests/test_kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def test_mpfile_both(self):
[None, {"flavor": "bbbb"}, "linux-bbbb-20.04"],
]
)
def test_ai(self, mpfile_data, ai_data, metapkg_name):
async def test_ai(self, mpfile_data, ai_data, metapkg_name):
if mpfile_data is not None:
self.setup_mpfile("etc/subiquity", mpfile_data)
self.controller.load_autoinstall_data(ai_data)
Expand Down

0 comments on commit b26d620

Please sign in to comment.