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.per...@citrix.com>
---
Osstest/Debian.pm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 9b30a375..7d6f9778 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');
--
Anthony PERARD
