From aec9f0dcbbdadd1e2934aaea9d3ab226e15bb80b Mon Sep 17 00:00:00 2001 From: Adrian Vladu Date: Thu, 15 Feb 2024 09:45:04 +0000 Subject: [PATCH] sys-kernel/dracut: Apply Flatcar patches to 060_pre20240104-r2 isci dracut module needs flatcar-network as a dependency, otherwise it cannot be installed by dracut. Signed-off-by: Adrian Vladu --- .../dracut/dracut-060_pre20240104-r2.ebuild | 2 ++ .../dracut/files/050-change-network-dep-iscsi.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/050-change-network-dep-iscsi.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-060_pre20240104-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-060_pre20240104-r2.ebuild index cca90219d0..2d8c0eaf56 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-060_pre20240104-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-060_pre20240104-r2.ebuild @@ -72,6 +72,8 @@ PATCHES=( "${FILESDIR}"/dracut-060-grub-layout.patch "${FILESDIR}"/dracut-060-systemd-255.patch "${FILESDIR}"/dracut-059-install-new-systemd-hibernate-resume.service.patch + # Flatcar: override iscsi network dependency + "${FILESDIR}"/050-change-network-dep-iscsi.patch ) src_configure() { diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/050-change-network-dep-iscsi.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/050-change-network-dep-iscsi.patch new file mode 100644 index 0000000000..9cb55881b5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/050-change-network-dep-iscsi.patch @@ -0,0 +1,12 @@ +As Flatcar uses the flatcar-network module, we need to replace it in the iscsi +module setup in order to enable iscsi support. +diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh +@@ -183,7 +183,7 @@ + + # called by dracut + depends() { +- echo network rootfs-block ++ echo flatcar-network rootfs-block + } + + # called by dracut