From a58474841ebb56988204d49cc5bfa58c9d3fb6b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Mon, 15 Jan 2024 23:12:26 +0100
Subject: [PATCH] [sys-kernel/dracut] sync

---
 sys-kernel/dracut/Manifest                    |  2 +-
 ...2.ebuild => dracut-060_pre20240104.ebuild} |  3 ++-
 sys-kernel/dracut/dracut-9999.ebuild          |  2 +-
 .../dracut/files/dracut-060-grub-layout.patch | 22 +++++++++++++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)
 rename sys-kernel/dracut/{dracut-060_pre20231030-r2.ebuild => dracut-060_pre20240104.ebuild} (98%)
 create mode 100644 sys-kernel/dracut/files/dracut-060-grub-layout.patch

diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index de2841c..3bd6205 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1 +1 @@
-DIST dracut-060_pre20231030.tar.gz 498954 BLAKE2B ce47f06e1304f732cbad66046c70cbcb03d33d69b9c3e87a4e2e2d30fa837b3b36949462cec9b06125e824ad82db45bd7516c22a1c84ec6884790b37e9c65ab1 SHA512 0cd2fefcd624758063c77836989260a3d5b0d533004c2395124c8200c31602f5d7d0b8c9491de37ce4afb2c5009b2cf944ddd3bb9e0e11120d84176cb1e7423c
+DIST dracut-060_pre20240104.tar.gz 499965 BLAKE2B 935e0e5da348426d69c6dab6b91078f126cadd9ffc6a32378e79cd93b1dbadff35899efc3786fc12bf5a6741843d3637b0c98cc71fe4a96a8caf053ae887bac3 SHA512 f7818265f082e9c05ebb81a91b67fb9b1d3bf8b2433b7e6ea9be6bee43d28cd1ee48577648e1d9b3729c17608b028d294c13bf5d4db4cc5a18e3b007eb2cd67e
diff --git a/sys-kernel/dracut/dracut-060_pre20231030-r2.ebuild b/sys-kernel/dracut/dracut-060_pre20240104.ebuild
similarity index 98%
rename from sys-kernel/dracut/dracut-060_pre20231030-r2.ebuild
rename to sys-kernel/dracut/dracut-060_pre20240104.ebuild
index 20c4e40..da3eba8 100644
--- a/sys-kernel/dracut/dracut-060_pre20231030-r2.ebuild
+++ b/sys-kernel/dracut/dracut-060_pre20240104.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
 		sys-libs/libselinux
 		sys-libs/libsepol
 	)
-	!dracut-cpio? ( app-arch/cpio )
+	!dracut-cpio? ( app-alternatives/cpio )
 "
 DEPEND="
 	>=sys-apps/kmod-23
@@ -72,6 +72,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
 PATCHES=(
 	"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
 	"${FILESDIR}"/dracut-060-fix-resume-hostonly.patch
+	"${FILESDIR}"/dracut-060-grub-layout.patch
 	"${FILESDIR}"/dracut-060-systemd-255.patch
 	"${FILESDIR}"/dracut-059-install-new-systemd-hibernate-resume.service.patch
 )
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild
index 7fd96d6..9b0f5b0 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
 		sys-libs/libselinux
 		sys-libs/libsepol
 	)
-	!dracut-cpio? ( app-arch/cpio )
+	!dracut-cpio? ( app-alternatives/cpio )
 "
 DEPEND="
 	>=sys-apps/kmod-23
diff --git a/sys-kernel/dracut/files/dracut-060-grub-layout.patch b/sys-kernel/dracut/files/dracut-060-grub-layout.patch
new file mode 100644
index 0000000..5d8e9a9
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-060-grub-layout.patch
@@ -0,0 +1,22 @@
+Ensures that the generated initrd is installed in the "new" way via the
+staging area in the grub layout. This prevents accidentally creating
+an UKI named initrd, and also ensures that BOOT_ROOT and
+KERNEL_INSTALL_INITRD_GENERATOR are respected when the layout is set to grub.
+
+Downstream only since the grub layout for using grub with systemd's
+kernel-install is not supported by systemd upstream and therefore this
+patch is unlikely to be accepted by dracut upstream.
+
+diff --git a/install.d/50-dracut.install b/install.d/50-dracut.install
+index 441414a..cfd4fe7 100755
+--- a/install.d/50-dracut.install
++++ b/install.d/50-dracut.install
+@@ -30,7 +30,7 @@ if [[ $KERNEL_INSTALL_LAYOUT == "uki" && -n $KERNEL_INSTALL_STAGING_AREA ]]; the
+     else
+         exit 0
+     fi
+-elif [[ $KERNEL_INSTALL_LAYOUT == "bls" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then
++elif [[ $KERNEL_INSTALL_LAYOUT == "bls" || $KERNEL_INSTALL_LAYOUT == "grub" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then
+     BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
+     if [[ -z $KERNEL_INSTALL_INITRD_GENERATOR || $KERNEL_INSTALL_INITRD_GENERATOR == "dracut" ]]; then
+         IMAGE="initrd"