Update uefi-functions.sh

Use /usr/*/grub*/x86_64-efi/partmap.lst instead of /usr/lib/grub*/x86_64-efi/partmap.lst because since openSUSE Leap 15.1 things were moved from /usr/lib/grub2/ to /usr/share/grub2/ see #2338 (comment) and replaced LogWarn by LogPrint because there is no LogWarn function.
rear · Mar 4, 2020 · de9391c · de9391c
1 parent d7729b0
commit de9391c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/usr/share/rear/lib/uefi-functions.sh b/usr/share/rear/lib/uefi-functions.sh
@@ -77,10 +77,12 @@ function build_bootx86_efi {
             # At least SUSE systems use 'grub2' prefixed names for GRUB2 programs:
             gprobe=grub2-probe
         else
-            LogWarn "Neither grub-probe nor grub2-probe found"
-            if test /usr/lib/grub*/x86_64-efi/partmap.lst ; then
-                LogWarn "including all partition modules"
-                modules=( $(cat /usr/lib/grub*/x86_64-efi/partmap.lst) )
+            LogPrint "Neither grub-probe nor grub2-probe found"
+            # Since openSUSE Leap 15.1 things were moved from /usr/lib/grub2/ to /usr/share/grub2/
+            # cf. https://github.com/rear/rear/issues/2338#issuecomment-594432946
+            if test /usr/*/grub*/x86_64-efi/partmap.lst ; then
+                LogPrint "including all partition modules"
+                modules=( $( cat /usr/*/grub*/x86_64-efi/partmap.lst ) )
             else
                 Error "Can not determine partition modules, ${dirs[*]} would be likely inaccessible in GRUB2"
             fi