From: Jóhann B. Guðmundsson <johannbg@gmail.com>
Date: Thu, 28 Jan 2021 14:15:07 +0000 (+0000)
Subject: fix: adding missing efi paths
X-Git-Tag: 052~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba2e760b91745c5d8ff5f9b0df9b21c383165d41;p=thirdparty%2Fdracut.git

fix: adding missing efi paths
---

diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh
index 184697722..ff6c38698 100644
--- a/dracut-initramfs-restore.sh
+++ b/dracut-initramfs-restore.sh
@@ -16,10 +16,17 @@ SKIP="$dracutbasedir/skipcpio"
 
 mount -o ro /boot &>/dev/null || true
 
-if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
+if [[ -d /efi/loader/entries || -L /efi/loader/entries ]] \
+    && [[ $MACHINE_ID ]] \
+    && [[ -d /efi/${MACHINE_ID} || -L /efi/${MACHINE_ID} ]] ; then
+    IMG="/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
+elif [[ -d /boot/loader/entries || -L /boot/loader/entries ]] \
+    && [[ $MACHINE_ID ]] \
+    && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
     IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
+else
+    IMG="/boot/initramfs-${KERNEL_VERSION}.img"
 fi
-[[ -f $IMG ]] || IMG="/boot/initramfs-${KERNEL_VERSION}.img"
 
 cd /run/initramfs