Dessa/gentoo
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

[sys-kernel/dracut] sync

Browse Source
This commit is contained in:
Robert Förster 2024-02-04 03:33:22 +01:00
parent d823c2e168
commit 46ea85fce4
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sys-kernel/dracut/dracut-060_pre20240104-r1.ebuild → sys-kernel/dracut/dracut-060_pre20240104-r2.ebuild
View File

23
sys-kernel/dracut/files/dracut-060-grub-layout.patch
View File

@ -8,15 +8,24 @@ kernel-install is not supported by systemd upstream and therefore this
patch is unlikely to be accepted by dracut upstream. patch is unlikely to be accepted by dracut upstream.
diff --git a/install.d/50-dracut.install b/install.d/50-dracut.install 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 --- a/install.d/50-dracut.install
+++ b/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 else
exit 0 exit 0
fi fi
-elif [[ $KERNEL_INSTALL_LAYOUT == "bls" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then +elif [[ $KERNEL_INSTALL_LAYOUT == "grub" || $KERNEL_INSTALL_LAYOUT == "compat" ]]; then
+elif [[ $KERNEL_INSTALL_LAYOUT == "bls" || $KERNEL_INSTALL_LAYOUT == "grub" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then + BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA" + if [[ -z $KERNEL_INSTALL_UKI_GENERATOR || $KERNEL_INSTALL_UKI_GENERATOR == "dracut" ]]; then
if [[ -z $KERNEL_INSTALL_INITRD_GENERATOR || $KERNEL_INSTALL_INITRD_GENERATOR == "dracut" ]]; then + IMAGE="uki.efi"
IMAGE="initrd" + 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=""