From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: Re: [OSSTEST PATCH 21/26] ts-debian-hvm-install: Do not
 create EFI partition if EFI not in use
Date: Mon, 21 Sep 2015 10:32:27 +0100
Message-ID: <1442827947.10338.24.camel@citrix.com>
References: <1442598616-2884-1-git-send-email-ian.jackson@eu.citrix.com>
	<1442598616-2884-8-git-send-email-ian.jackson@eu.citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta5.messagelabs.com ([195.245.231.135])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <prvs=699e7550d=Ian.Campbell@citrix.com>)
	id 1ZdxSf-0004x0-HJ
	for xen-devel@lists.xenproject.org; Mon, 21 Sep 2015 09:32:37 +0000
In-Reply-To: <1442598616-2884-8-git-send-email-ian.jackson@eu.citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Ian Jackson <ian.jackson@eu.citrix.com>, xen-devel@lists.xenproject.org
List-Id: xen-devel@lists.xenproject.org

On Fri, 2015-09-18 at 18:50 +0100, Ian Jackson wrote:
> 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@eu.citrix.com>

FWIW the default recipes used by d-i use "$iflabel{ gpt }" to achieve the
same thing. Actually I'm a bit surprised that this isn't the affect of
"method { efi }" too.

Anyway, this approach is good enough for our purposes so:

Acked-by: Ian Campbell <ian.campbell@citrix.com>


> ---
>  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);