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-01-15 23:12:26 +01:00
parent e463189d82
commit a58474841e
4 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sys-kernel/dracut/files/dracut-060-grub-layout.patch Normal file
View File

@@ -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"