only require grub-efi to succeed if booted using UEFI

[pve-installer.git] / proxinstall

diff --git a/proxinstall b/proxinstall
index 18df7bb3c1a1da9a76b50f8d3617af616e17dc26..8d8d26328f6e93f0777530baf5824e2fbe1c76a4 100755 (executable)
--- a/proxinstall
+++ b/proxinstall
@@ -1440,8 +1440,14 @@ _EOD
                if ($di->{esp}) {
                    syscmd ("mount -n $di->{esp} $targetdir/boot/efi") == 0 ||
                        die "unable to mount $di->{esp}\n";
-                   syscmd ("chroot $targetdir /usr/sbin/grub-install --target x86_64-efi --no-floppy --bootloader-id='proxmox' $dev") == 0 ||
-                       die "unable to install the EFI boot loader on '$dev'\n";
+                   my $rc = syscmd ("chroot $targetdir /usr/sbin/grub-install --target x86_64-efi --no-floppy --bootloader-id='proxmox' $dev");
+                   if ($rc != 0) {
+                       if (-d '/sys/firmware/efi') {
+                           die "unable to install the EFI boot loader on '$dev'\n";
+                       } else {
+                           warn "unable to install the EFI boot loader on '$dev', ignoring (not booted using UEFI)\n";
+                       }
+                   }
                    # also install fallback boot file (OVMF does not boot without)
                    mkdir("$targetdir/boot/efi/EFI/BOOT");
                    syscmd("cp $targetdir/boot/efi/EFI/proxmox/grubx64.efi $targetdir/boot/efi/EFI/BOOT/BOOTx64.EFI") == 0 ||