From bbe9107b48a4188c65bcc0f4561610458f3fa663436a6d2a429bf0e817a753f0 Mon Sep 17 00:00:00 2001 From: Ignaz Forster Date: Thu, 7 Sep 2023 12:45:03 +0000 Subject: [PATCH] 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 --- ...-disks.service-before-systemd-fsck-roo.patch | 17 +++++++---------- ignition.changes | 6 ++++++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/0004-Order-ignition-disks.service-before-systemd-fsck-roo.patch b/0004-Order-ignition-disks.service-before-systemd-fsck-roo.patch index 9a93cd7..673b587 100644 --- a/0004-Order-ignition-disks.service-before-systemd-fsck-roo.patch +++ b/0004-Order-ignition-disks.service-before-systemd-fsck-roo.patch @@ -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 any ignition units, so ignition units can't use -Before=initrd-root-device.target. Use systemd-fsck-root.service instead, which -fits the comment above more anyway. +Before=initrd-root-device.target. Use systemd-fsck-root.service and +dracut-pre-mount.service instead, which fits the comment above more anyway. --- dracut/30ignition/ignition-disks.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/dracut/30ignition/ignition-disks.service b/dracut/30ignition/ignition-disks.service -index 730063f1..2c817408 100644 ---- a/dracut/30ignition/ignition-disks.service -+++ b/dracut/30ignition/ignition-disks.service +Index: ignition-2.16.2/dracut/30ignition/ignition-disks.service +=================================================================== +--- ignition-2.16.2.orig/dracut/30ignition/ignition-disks.service ++++ ignition-2.16.2/dracut/30ignition/ignition-disks.service @@ -9,7 +9,7 @@ Before=ignition-complete.target After=ignition-fetch.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 # before `sysroot.mount` on principle. -Before=initrd-root-device.target -+Before=systemd-fsck-root.service ++Before=systemd-fsck-root.service dracut-pre-mount.service Before=sysroot.mount OnFailure=emergency.target --- -2.41.0 - diff --git a/ignition.changes b/ignition.changes index 0bba206..3a84a0b 100644 --- a/ignition.changes +++ b/ignition.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 6 15:29:10 UTC 2023 - Fabian Vogt + +- 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