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
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
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
|
|
|
|
Currently the module is automatically included in all initrds, hostonly or
|
|
generic. Leave it to the distro provided module to pull it in explicitly.
|
|
---
|
|
docs/release-notes.md | 4 ++++
|
|
dracut/30ignition/module-setup.sh | 7 +++++++
|
|
2 files changed, 11 insertions(+)
|
|
|
|
diff --git a/docs/release-notes.md b/docs/release-notes.md
|
|
index e53bdf8d..65ce77ce 100644
|
|
--- a/docs/release-notes.md
|
|
+++ b/docs/release-notes.md
|
|
@@ -8,6 +8,10 @@ nav_order: 9
|
|
|
|
### Breaking changes
|
|
|
|
+- The dracut module is not automatically included in initramfs images anymore.
|
|
+ Distributions need to explicitly request inclusion, either by ensuring that
|
|
+ it is pulled in by another module, for instance the module providing distro
|
|
+ integration and customization, or by installing a dracut configuration file.
|
|
|
|
### Features
|
|
|
|
diff --git a/dracut/30ignition/module-setup.sh b/dracut/30ignition/module-setup.sh
|
|
index ad7e80fd..f431b7dc 100755
|
|
--- a/dracut/30ignition/module-setup.sh
|
|
+++ b/dracut/30ignition/module-setup.sh
|
|
@@ -2,6 +2,13 @@
|
|
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
|
# ex: ts=8 sw=4 sts=4 et filetype=sh
|
|
|
|
+check() {
|
|
+ # Only include this if another module requests it.
|
|
+ # In our case it'll be the distro provided module with integration and customizations
|
|
+ # (coreos-ignition/ignition-microos/...).
|
|
+ return 255
|
|
+}
|
|
+
|
|
depends() {
|
|
echo qemu systemd url-lib network
|
|
}
|
|
--
|
|
2.41.0
|
|
|