Accepting request 1109547 from devel:kubic:ignition

OBS-URL: https://build.opensuse.org/request/show/1109547
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ignition?expand=0&rev=41

0003-Move-the-GPT-header-on-resized-disks.patch

@@ -1,7 +1,14 @@
 From: Ignaz Forster <iforster@suse.com>
 Date: Tue, 22 Aug 2023 16:13:07 +0200
-Subject: [PATCH] Move the GPT header on resized disks
+Subject: [PATCH] Move GTP header to the end on resized disk images
 
+Fedora CoreOS is handling the GPT move by putting flags into the disk's
+GUID (see also [gh#coreos/ignition#839]) and then adjusting the root disk
+in
+https://github.com/coreos/fedora-coreos-config/blob/testing-devel/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-gpt-setup.sh.
+We are not using the CoreOS Assembler and have no reason to change the
+UUID, so introducing a dracut service just to possibly move the GPT seems
+like overkill. Just do so when creating new partitions.
 ---
  internal/sgdisk/sgdisk.go | 1 +
  1 file changed, 1 insertion(+)

0004-Order-ignition-disks.service-before-systemd-fsck-roo.patch

@@ -1,20 +1,19 @@
-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.
+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
@@ -29,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
-

0005-dracut-Don-t-include-the-ignition-module-by-default.patch

@@ -1,4 +1,3 @@
-From 7b753b963953392aca6e44a7be9441e01e70ff2d Mon Sep 17 00:00:00 2001
 From: Fabian Vogt <fvogt@suse.de>
 Date: Mon, 21 Aug 2023 14:17:01 +0200
 Subject: [PATCH] dracut: Don't include the ignition module by default

ignition.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+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>
+
+- Patch file cleanup:
+  * Improve description of
+    0003-Move-the-GPT-header-on-resized-disks.patch
+  * Rename
+    0001-Order-ignition-disks.service-before-systemd-fsck-roo.patch
+    to
+    0004-Order-ignition-disks.service-before-systemd-fsck-roo.patch
+  * Rename
+    0001-dracut-Don-t-include-the-ignition-module-by-default.patch
+    to
+    0005-dracut-Don-t-include-the-ignition-module-by-default.patch
+
 -------------------------------------------------------------------
 Wed Aug 23 13:47:34 UTC 2023 - Fabian Vogt <fvogt@suse.com>
 

ignition.spec

@@ -42,9 +42,9 @@ Source21:       ignition-userconfig-timeout-arm.conf
 Patch1:         0001-ignore-missing-qemu-blockdev.patch
 Patch2:         0002-allow-multiple-mounts-of-same-device.patch
 Patch3:         0003-Move-the-GPT-header-on-resized-disks.patch
-Patch4:         0001-Order-ignition-disks.service-before-systemd-fsck-roo.patch
+Patch4:         0004-Order-ignition-disks.service-before-systemd-fsck-roo.patch
 # https://github.com/coreos/ignition/pull/1698
-Patch5:         0001-dracut-Don-t-include-the-ignition-module-by-default.patch
+Patch5:         0005-dracut-Don-t-include-the-ignition-module-by-default.patch
 BuildRequires:  dracut
 BuildRequires:  libblkid-devel
 BuildRequires:  systemd-rpm-macros