also skip proxmox-grub if not booted in EFI mode

This would effectively pull in grub-efi-amd64, which we skip a line
above this if not in EFI mode..

The builder now adds this always to the packages due to the
proxmox-secure-boot-support meta package being present there, at least
that's my current educated guess (confirmed in practice).

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Proxmox/Install.pm b/Proxmox/Install.pm
index 2541bc4520c09c866348aaca23f209283f63492e..6ad9d17be45a5f1371c9cb6d43478f267124a627 100644 (file)
--- a/Proxmox/Install.pm
+++ b/Proxmox/Install.pm
@@ -1099,6 +1099,7 @@ _EOD
            # upon upgrade - and conflict with each other - install the fitting one only
            next if ($deb =~ /grub-pc_/ && $run_env->{boot_type} ne 'bios');
            next if ($deb =~ /grub-efi-amd64_/ && $run_env->{boot_type} ne 'efi');
+           next if ($deb =~ /^proxmox-grub/ && $run_env->{boot_type} ne 'efi');
            next if ($deb =~ /^proxmox-secure-boot-support_/ && !$run_env->{secure_boot});
 
            update_progress($count/$pkg_count, 0.5, 0.75, "extracting $deb");