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 <anthony.perard@citrix.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 9b30a37583a1b3c4b6a13d232d4acd8c6bf4fd5b..7d6f97787b68b744a08640dffba83aa2230652ec 100644 (file)
--- 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');