Skip to content

Fix recovery chooser trigger on NUC#97

Merged
valentindavid merged 1 commit intocanonical:mainfrom
valentindavid:valentindavid/nuc-fix
Jun 30, 2022
Merged

Fix recovery chooser trigger on NUC#97
valentindavid merged 1 commit intocanonical:mainfrom
valentindavid:valentindavid/nuc-fix

Conversation

@valentindavid
Copy link
Copy Markdown
Member

We need to chroot when switching root, so we send SIGUSR1 to recovery
chooser trigger.

We need to load all hid drivers. We should not load them into the
kernel though.

This works with canonical/snapd#11742

Copy link
Copy Markdown
Member

@alfonsosanchezbeato alfonsosanchezbeato left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, just have a question below.

@alfonsosanchezbeato
Copy link
Copy Markdown
Member

This can leverage the change to include modules without adding to modules.d that has been just merged.

We need to chroot when switching root, so we send SIGUSR1 to recovery
chooser trigger.

We need to load all hid drivers. We should not load them into the
kernel though.
@valentindavid valentindavid force-pushed the valentindavid/nuc-fix branch from 3f801b3 to 9d81012 Compare June 17, 2022 09:59
Copy link
Copy Markdown
Member

@alfonsosanchezbeato alfonsosanchezbeato left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Do we need the change in snapd released to merge this?

@valentindavid
Copy link
Copy Markdown
Member Author

Do we need the change in snapd released to merge this?

Yes. We need canonical/snapd#11742 which is merged. Not sure if it was released. But the thing is just broken. So not having the updated snapd does not make it any more broken with that one merged.

Copy link
Copy Markdown
Member

@Meulengracht Meulengracht left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@valentindavid valentindavid merged commit 086765a into canonical:main Jun 30, 2022
valentindavid added a commit to valentindavid/snapd that referenced this pull request Jul 31, 2024
core-initrd for UC20 is missing the following fixes:
 * canonical/core-initrd#64
 * canonical/core-initrd#70
 * canonical/core-initrd#97

Because of that, it still kills recovery-chooser-trigger from initrd,
and expects it to re-run from snapd snap. Until those fixes
are backported, we need to keep on building snap-bootstrap.

This is not needed by UC22+
ernestl pushed a commit to canonical/snapd that referenced this pull request Aug 2, 2024
core-initrd for UC20 is missing the following fixes:
 * canonical/core-initrd#64
 * canonical/core-initrd#70
 * canonical/core-initrd#97

Because of that, it still kills recovery-chooser-trigger from initrd,
and expects it to re-run from snapd snap. Until those fixes
are backported, we need to keep on building snap-bootstrap.

This is not needed by UC22+
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants