The previous refactoring of preseed hooks makes this easy to do.
The underlying issue is lack of persistent variable store in our OVMF
setup, which we workaround by placing a copy of grub at the removable
media path. Add a comment saying this since I initially thought this
was just a Wheezy bug.
In Jessie the extra copy of grub can be achieved by preseeding
grub-installer/force-efi-extra-removable (since various real h/w has
similar limitations/bugs) however I haven't tested that so I didn't
add it to the preseed yet, I just mention it in the code comment.
Currently this script hardcodes Wheezy, refactor to use the 'suite'
guest_var (or $c{GuestDebianSuite})
Signed-off-by: Ian Campbell <[email protected]>
Cc: [email protected]
---
v6: New patch
---
ts-debian-hvm-install | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
index b37f0f9..f3629e1 100755
--- a/ts-debian-hvm-install
+++ b/ts-debian-hvm-install
@@ -41,9 +41,11 @@ our $disk_mb= 10000;
our $guesthost= "$gn.guest.osstest";
our $gho;
+our $gsuite= guest_var($gho,'suite',$c{GuestDebianSuite});
+
sub preseed () {
- my $preseed_file = preseed_base($gho,'wheezy','','',());
+ my $preseed_file = preseed_base($gho,$gsuite,'','',());
$preseed_file .= (<<END);
d-i netcfg/get_hostname string $gn
@@ -71,7 +73,15 @@ d-i partman-auto/expert_recipe string \\
d-i apt-setup/cdrom/set-first boolean false
END
-preseed_hook_command($gho, 'late_command', '', <<END);
+
+ # Our OVMF does not have a persistent variable store and therefore
+ # cannot remember the boot entry added by the Debian
+ # installer. Therefore we ensure that a copy of the bootloader is
+ # copied to the removable media path, which is the EFI fallback.
+ #
+ # From Jessie onwards this can be worked around by using the fix to
+ # #767037 i.e. preseeding grub-installer/force-efi-extra-removable.
+preseed_hook_command($gho, 'late_command', '', <<END) if $gsuite =~ /wheezy/;
#!/bin/sh
set -ex
--
2.1.4
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel
