[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [OSSTEST PATCH 21/26] ts-debian-hvm-install: Do not create EFI partition if EFI not in use
If we are booting our install ISO using a non-EFI executable, don't try to provide an EFI for the installed system either. Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx> --- ts-debian-hvm-install | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install index fb07293..9bc6cc8 100755 --- a/ts-debian-hvm-install +++ b/ts-debian-hvm-install @@ -49,6 +49,7 @@ our $guesthost= "$gn.guest.osstest"; our $gho; our ($kernel, $ramdisk); +our $bootfile; our $gsuite; @@ -56,7 +57,7 @@ sub preseed () { my $preseed_file = preseed_base($gho,$gsuite,'','',()); - $preseed_file .= (<<END); + $preseed_file .= (<<END.($bootfile =~ m/\.efi/ ? <<END : '').<<END); d-i netcfg/get_hostname string $gn d-i partman-auto/disk string /dev/xvda @@ -64,12 +65,14 @@ d-i partman-auto/method string regular d-i partman-auto/expert_recipe string \\ boot-root :: \\ +END 512 50 512 vfat \\ \$primary{ } \$bootable{ } \\ method{ efi } format{ } \\ use_filesystem{ } filesystem{ vfat } \\ mountpoint{ /boot/efi } \\ . \\ +END 5000 50 5000 ext4 \\ method{ format } format{ } \\ use_filesystem{ } filesystem{ ext4 } \\ @@ -201,7 +204,7 @@ sub prep () { -no-emul-boot -r); - my $bootfile = 'boot/grub/efi.img'; + $bootfile = 'boot/grub/efi.img'; if (!target_file_exists($ho, "$newiso/$bootfile")) { $bootfile = "isolinux/isolinux.bin"; push @isogen_extra, qw(-c isolinux/boot.cat); -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |