From 46ea85fce4e320317c0ead0f2dcb1ddb8cbd4c6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Sun, 4 Feb 2024 03:33:22 +0100
Subject: [PATCH] [sys-kernel/dracut] sync

---
 ...build => dracut-060_pre20240104-r2.ebuild} |  0
 .../dracut/files/dracut-060-grub-layout.patch | 23 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)
 rename sys-kernel/dracut/{dracut-060_pre20240104-r1.ebuild => dracut-060_pre20240104-r2.ebuild} (100%)

diff --git a/sys-kernel/dracut/dracut-060_pre20240104-r1.ebuild b/sys-kernel/dracut/dracut-060_pre20240104-r2.ebuild
similarity index 100%
rename from sys-kernel/dracut/dracut-060_pre20240104-r1.ebuild
rename to sys-kernel/dracut/dracut-060_pre20240104-r2.ebuild
diff --git a/sys-kernel/dracut/files/dracut-060-grub-layout.patch b/sys-kernel/dracut/files/dracut-060-grub-layout.patch
index 5d8e9a9..b04140f 100644
--- a/sys-kernel/dracut/files/dracut-060-grub-layout.patch
+++ b/sys-kernel/dracut/files/dracut-060-grub-layout.patch
@@ -8,15 +8,24 @@ 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
+index 441414ac..a98449fe 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
+@@ -38,6 +38,17 @@ elif [[ $KERNEL_INSTALL_LAYOUT == "bls" && -n $KERNEL_INSTALL_STAGING_AREA ]]; t
      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"
++elif [[ $KERNEL_INSTALL_LAYOUT == "grub" || $KERNEL_INSTALL_LAYOUT == "compat" ]]; then
++    BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
++    if [[ -z $KERNEL_INSTALL_UKI_GENERATOR || $KERNEL_INSTALL_UKI_GENERATOR == "dracut" ]]; then
++        IMAGE="uki.efi"
++        UEFI_OPTS="--uefi"
++    elif [[ -z $KERNEL_INSTALL_INITRD_GENERATOR || $KERNEL_INSTALL_INITRD_GENERATOR == "dracut" ]]; then
++        IMAGE="initrd"
++        UEFI_OPTS="--no-uefi"
++    else
++        exit 0
++    fi
+ else
+     # No layout information, use users --uefi/--no-uefi preference
+     UEFI_OPTS=""