Merge ~anonymouse67/ubuntu-core-initramfs:bugfix/uc20-the-tool-dep-modules-load into ~canonical-foundations/ubuntu-core-initramfs:master

Proposed by Ian Johnson
Status: Merged
Merged at revision: 64e52e3f03e535a8984bae76dbf62b0bedf47774
Proposed branch: ~anonymouse67/ubuntu-core-initramfs:bugfix/uc20-the-tool-dep-modules-load
Merge into: ~canonical-foundations/ubuntu-core-initramfs:master
Diff against target: 13 lines (+2/-0)
1 file modified
factory/usr/lib/systemd/system/the-tool.service (+2/-0)
Reviewer Review Type Date Requested Status
Dimitri John Ledkov (community) Approve
Review via email: mp+383246@code.launchpad.net

Commit message

This is not a Requires because during you might have situations where not all of
the modules loaded and hence systemd-modules-load fails, but in this case you
should still have enough to get further in the boot.

This is also what was in the service before a refactoring and was inadvertently
dropped.

Fixes https://bugs.launchpad.net/snapd/+bug/1875968.

Description of the change

This is not a Requires because during you might have situations where not all of
the modules loaded and hence systemd-modules-load fails, but in this case you
should still have enough to get further in the boot.

This is also what was in the service before a refactoring and was inadvertently
dropped.

Fixes https://bugs.launchpad.net/snapd/+bug/1875968.

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) :
review: Approve
Revision history for this message
Dimitri John Ledkov (xnox) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/factory/usr/lib/systemd/system/the-tool.service b/factory/usr/lib/systemd/system/the-tool.service
2index db27847..e18765d 100644
3--- a/factory/usr/lib/systemd/system/the-tool.service
4+++ b/factory/usr/lib/systemd/system/the-tool.service
5@@ -3,6 +3,8 @@ OnFailure=emergency.target
6 OnFailureJobMode=replace-irreversibly
7 DefaultDependencies=no
8 After=systemd-tmpfiles-setup.service
9+After=systemd-modules-load.service
10+Wants=systemd-modules-load.service
11
12 Requires=systemd-fsck@dev-disk-by\x2dlabel-ubuntu\x2dseed.service
13 After=systemd-fsck@dev-disk-by\x2dlabel-ubuntu\x2dseed.service

Subscribers

People subscribed via source and target branches