Accepting request 1109544 from home:favogt:combustion
- Amend patch to fix race condition with kiwi: * 0005-dracut-Don-t-include-the-ignition-module-by-default.patch OBS-URL: https://build.opensuse.org/request/show/1109544 OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=114
This commit is contained in:
parent
5825f98260
commit
bbe9107b48
@ -4,16 +4,16 @@ Subject: [PATCH] Order ignition-disks.service before systemd-fsck-root.service
|
|||||||
|
|
||||||
firstboot-detect.service needs initrd-root-device.target but has to be before
|
firstboot-detect.service needs initrd-root-device.target but has to be before
|
||||||
any ignition units, so ignition units can't use
|
any ignition units, so ignition units can't use
|
||||||
Before=initrd-root-device.target. Use systemd-fsck-root.service instead, which
|
Before=initrd-root-device.target. Use systemd-fsck-root.service and
|
||||||
fits the comment above more anyway.
|
dracut-pre-mount.service instead, which fits the comment above more anyway.
|
||||||
---
|
---
|
||||||
dracut/30ignition/ignition-disks.service | 4 ++--
|
dracut/30ignition/ignition-disks.service | 4 ++--
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/dracut/30ignition/ignition-disks.service b/dracut/30ignition/ignition-disks.service
|
Index: ignition-2.16.2/dracut/30ignition/ignition-disks.service
|
||||||
index 730063f1..2c817408 100644
|
===================================================================
|
||||||
--- a/dracut/30ignition/ignition-disks.service
|
--- ignition-2.16.2.orig/dracut/30ignition/ignition-disks.service
|
||||||
+++ b/dracut/30ignition/ignition-disks.service
|
+++ ignition-2.16.2/dracut/30ignition/ignition-disks.service
|
||||||
@@ -9,7 +9,7 @@ Before=ignition-complete.target
|
@@ -9,7 +9,7 @@ Before=ignition-complete.target
|
||||||
After=ignition-fetch.service
|
After=ignition-fetch.service
|
||||||
Before=ignition-mount.service
|
Before=ignition-mount.service
|
||||||
@ -28,10 +28,7 @@ index 730063f1..2c817408 100644
|
|||||||
# completely wipe the rootfs. Though we're not there yet. But we still run
|
# completely wipe the rootfs. Though we're not there yet. But we still run
|
||||||
# before `sysroot.mount` on principle.
|
# before `sysroot.mount` on principle.
|
||||||
-Before=initrd-root-device.target
|
-Before=initrd-root-device.target
|
||||||
+Before=systemd-fsck-root.service
|
+Before=systemd-fsck-root.service dracut-pre-mount.service
|
||||||
Before=sysroot.mount
|
Before=sysroot.mount
|
||||||
|
|
||||||
OnFailure=emergency.target
|
OnFailure=emergency.target
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Sep 6 15:29:10 UTC 2023 - Fabian Vogt <fvogt@suse.com>
|
||||||
|
|
||||||
|
- Amend patch to fix race condition with kiwi:
|
||||||
|
* 0005-dracut-Don-t-include-the-ignition-module-by-default.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Aug 25 13:19:15 UTC 2023 - Ignaz Forster <iforster@suse.com>
|
Fri Aug 25 13:19:15 UTC 2023 - Ignaz Forster <iforster@suse.com>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user