From 5825f98260b7fe5a46f0b7bacaadfc9c219f1b740f81b8b530e8d0f2bea779f7 Mon Sep 17 00:00:00 2001 From: Ignaz Forster Date: Wed, 6 Sep 2023 11:12:20 +0000 Subject: [PATCH] - 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 OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=113 --- 0003-Move-the-GPT-header-on-resized-disks.patch | 9 ++++++++- ...on-disks.service-before-systemd-fsck-roo.patch | 1 - ...t-include-the-ignition-module-by-default.patch | 1 - ignition.changes | 15 +++++++++++++++ ignition.spec | 4 ++-- 5 files changed, 25 insertions(+), 5 deletions(-) rename 0001-Order-ignition-disks.service-before-systemd-fsck-roo.patch => 0004-Order-ignition-disks.service-before-systemd-fsck-roo.patch (95%) rename 0001-dracut-Don-t-include-the-ignition-module-by-default.patch => 0005-dracut-Don-t-include-the-ignition-module-by-default.patch (95%) diff --git a/0003-Move-the-GPT-header-on-resized-disks.patch b/0003-Move-the-GPT-header-on-resized-disks.patch index 1e8117c..87e2b1b 100644 --- a/0003-Move-the-GPT-header-on-resized-disks.patch +++ b/0003-Move-the-GPT-header-on-resized-disks.patch @@ -1,7 +1,14 @@ From: Ignaz Forster 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(+) diff --git a/0001-Order-ignition-disks.service-before-systemd-fsck-roo.patch b/0004-Order-ignition-disks.service-before-systemd-fsck-roo.patch similarity index 95% rename from 0001-Order-ignition-disks.service-before-systemd-fsck-roo.patch rename to 0004-Order-ignition-disks.service-before-systemd-fsck-roo.patch index 59934fb..9a93cd7 100644 --- a/0001-Order-ignition-disks.service-before-systemd-fsck-roo.patch +++ b/0004-Order-ignition-disks.service-before-systemd-fsck-roo.patch @@ -1,4 +1,3 @@ -From c30af974e1487e4a23d773e2061873afd6dcb8bf Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 17 Aug 2023 13:51:24 +0200 Subject: [PATCH] Order ignition-disks.service before systemd-fsck-root.service diff --git a/0001-dracut-Don-t-include-the-ignition-module-by-default.patch b/0005-dracut-Don-t-include-the-ignition-module-by-default.patch similarity index 95% rename from 0001-dracut-Don-t-include-the-ignition-module-by-default.patch rename to 0005-dracut-Don-t-include-the-ignition-module-by-default.patch index 6abe85b..6c0ce65 100644 --- a/0001-dracut-Don-t-include-the-ignition-module-by-default.patch +++ b/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 Date: Mon, 21 Aug 2023 14:17:01 +0200 Subject: [PATCH] dracut: Don't include the ignition module by default diff --git a/ignition.changes b/ignition.changes index eeda47d..0bba206 100644 --- a/ignition.changes +++ b/ignition.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Aug 25 13:19:15 UTC 2023 - Ignaz Forster + +- 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 diff --git a/ignition.spec b/ignition.spec index b7a197a..290c573 100644 --- a/ignition.spec +++ b/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