diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-02-02 17:45:32 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-02-02 17:45:32 +0000 |
| commit | 5939313f229e6fcf374fb7e9ee4f8675b05ab293 (patch) | |
| tree | 0a8181cbc5d052ab4d26a8e1d2dc52f126063fc6 /sys-kernel/dracut/files | |
| parent | 7e3d6dcede5749fe6a1adef4e673a9dde7703b7b (diff) | |
gentoo auto-resync : 02:02:2024 - 17:45:32
Diffstat (limited to 'sys-kernel/dracut/files')
| -rw-r--r-- | sys-kernel/dracut/files/dracut-060-grub-layout.patch | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/sys-kernel/dracut/files/dracut-060-grub-layout.patch b/sys-kernel/dracut/files/dracut-060-grub-layout.patch index 5d8e9a9fcf9d..cf292b7168c4 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" && -n $KERNEL_INSTALL_STAGING_AREA ]]; 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="" |