From: Anthony PERARD Date: Tue, 20 Jun 2023 10:21:21 +0000 (+0100) Subject: preseed_create: Use new "d-i grub-installer/update-nvram" for UEFI installation X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=577157ed87fd79a1aebe592c47bc032f60e1c815;p=osstest.git preseed_create: Use new "d-i grub-installer/update-nvram" for UEFI installation Instead of "grub-installer/no-nvram" proposed in Debian bug #789798, we have "grub-installer/update-nvram". Make use of it, and remove workaround. Signed-off-by: Anthony PERARD Acked-by: Roger Pau Monné --- diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 9b30a37..7d6f977 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -1550,13 +1550,17 @@ d-i partman-auto/expert_recipe string \\ lv_name{ dummy } \\ . +# Prevent grub-install from making a new Debian boot entry, so +# we always reboot from the network. +d-i grub-installer/update-nvram boolean false END - if (get_host_property($ho, "firmware") eq "uefi") { - die unless $ho->{Suite} =~ m/jessie|stretch|buster/; + if (get_host_property($ho, "firmware") eq "uefi" && + $ho->{Suite} =~ m/jessie|stretch|buster/) { # Prevent grub-install from making a new Debian boot entry, so # we always reboot from the network. Debian bug #789798 proposes a - # properly preseedable solution to this. + # properly preseedable solution to this. Implemented with + # "grub-installer/update-nvram". preseed_hook_installscript($ho, $sfx, '/usr/lib/base-installer.d/', 'osstest-disable-grub-nvram', <<'END');