From 033048444f8b5c83759bc8b8bf767c240c938e33 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Fri, 25 Jun 2021 15:57:10 +0530 Subject: [PATCH] sys-kernel/dracut: Apply Flatcar patches Add Flatcar specific patch to enable the iscsi module Flatcar uses its own network module instead of the Dracut one, but the iscsi module depends on the network. So, in order to enable the iscsi module, we need to patch the dependency Signed-off-by: Sayan Chowdhury --- .../sys-kernel/dracut/dracut-050-r2.ebuild | 4 +++- .../dracut/files/050-change-network-dep-iscsi.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) 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-050-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-050-r2.ebuild index 4eb3b1db06..7b8172dca5 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-050-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-050-r2.ebuild @@ -73,7 +73,9 @@ PATCHES=( "${FILESDIR}"/050-busybox-module-fix.patch "${FILESDIR}"/050-systemd-remove-obsolete-syslog-parameter.patch "${FILESDIR}"/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch - "${FILESDIR}"/gentoo-ldconfig-paths.patch + "${FILESDIR}"/050-gentoo-ldconfig-paths.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