569fa9e2a7
- Omit ignition module in initrds for already configured systems: * Add 0001-dracut-Don-t-include-the-ignition-module-by-default.patch * Edit module-setup.sh - Add explicit dep on combustion in module-setup.sh - Replace ignition-dracut-grub2 with combustion's firstboot.target: * Add 0001-Order-ignition-disks.service-before-systemd-fsck-roo.patch * Edit ignition-suse-generator * Edit ignition-umount-initrd-fstab.service * Edit module-setup.sh * Drop 02_ignition_firstboot * Drop ignition-firstboot-complete.service * Adjust README.SUSE - Edit ignition-umount-initrd-fstab.service to not rely on combustion units forcing proper order - Add 0003-Move-the-GPT-header-on-resized-disks.patch to make it - Fix patch file metadata in 0001-ignore-missing-qemu-blockdev.patch and 0002-allow-multiple-mounts-of-same-device.patch OBS-URL: https://build.opensuse.org/request/show/1105491 OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=111
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
From c30af974e1487e4a23d773e2061873afd6dcb8bf Mon Sep 17 00:00:00 2001
|
|
From: Fabian Vogt <fvogt@suse.de>
|
|
Date: Thu, 17 Aug 2023 13:51:24 +0200
|
|
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.
|
|
---
|
|
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
|
|
@@ -9,7 +9,7 @@ Before=ignition-complete.target
|
|
After=ignition-fetch.service
|
|
Before=ignition-mount.service
|
|
|
|
-# This stage runs between `basic.target` and `initrd-root-device.target`,
|
|
+# This stage runs between `basic.target` and `systemd-fsck-root.service`,
|
|
# see https://www.freedesktop.org/software/systemd/man/bootup.html
|
|
# Make sure to run before the file system checks, as sgdisk will trigger
|
|
# udev events, potentially resulting in race conditions due to disappearing
|
|
@@ -18,7 +18,7 @@ Before=ignition-mount.service
|
|
# Note that CL runs this before `local-fs-pre.target` to allow for configs that
|
|
# 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=sysroot.mount
|
|
|
|
OnFailure=emergency.target
|
|
--
|
|
2.41.0
|
|
|