From patchwork Mon Apr 28 10:41:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 29201 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 02FCC20B8D for ; Mon, 28 Apr 2014 10:42:47 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id pa12sf26999147veb.0 for ; Mon, 28 Apr 2014 03:42:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=hGARhXstK0Ks91WydUnAQcGduaqceDrmbPxkh8H8bq4=; b=W9krVGfooKhwjkWyNw1NmpyQZp5fMOdlD1QBjJQizo1pH0jfo+baCGSHapPInDtRUf FjIRgTdH44FecTLNzr0A5UdU2CGHRUGjDg4eXQPrvFnm28sbfSCKyWzzWbGJEbcym82+ 7v4hp4/kmlVP0CgfucVzVB9W2CqLQcXNsjQATK26qGoC4zc6r5CJZWSRMAUTsTZG1VUD k0iMv8Qt/G7JeJ+52YN0S55Y7Qa5I+P/KzGh8XkeMllTDsX2trwgiziL8Pj739Rn1JAM II3LIi7rR4Ja7LpO59Ufqq1o1l0rYUwUm/7D6/+02swt733UPoHyZyxjKuz3n5mojafO W2SQ== X-Gm-Message-State: ALoCoQk8rL0QQYNXjq2YU75R4q9mRTe/xh8gG3T7LK0fS3M6+SGKHuh1JoA/Yxvs/u7SyOI3GMAj X-Received: by 10.236.149.115 with SMTP id w79mr4405789yhj.41.1398681767701; Mon, 28 Apr 2014 03:42:47 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.80.107 with SMTP id b98ls2399607qgd.64.gmail; Mon, 28 Apr 2014 03:42:47 -0700 (PDT) X-Received: by 10.221.26.10 with SMTP id rk10mr23293090vcb.0.1398681767530; Mon, 28 Apr 2014 03:42:47 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id dl6si3522303veb.181.2014.04.28.03.42.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Apr 2014 03:42:47 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.128.174; Received: by mail-ve0-f174.google.com with SMTP id oz11so7736328veb.33 for ; Mon, 28 Apr 2014 03:42:47 -0700 (PDT) X-Received: by 10.220.190.197 with SMTP id dj5mr23048210vcb.19.1398681767441; Mon, 28 Apr 2014 03:42:47 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp107046vcb; Mon, 28 Apr 2014 03:42:46 -0700 (PDT) X-Received: by 10.224.6.10 with SMTP id 10mr32041957qax.45.1398681766255; Mon, 28 Apr 2014 03:42:46 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id n1si7546700qcr.1.2014.04.28.03.42.45 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 28 Apr 2014 03:42:46 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Wej0S-0007y8-Cs; Mon, 28 Apr 2014 10:41:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Wej0P-0007tR-54 for xen-devel@lists.xen.org; Mon, 28 Apr 2014 10:41:49 +0000 Received: from [193.109.254.147:59273] by server-12.bemta-14.messagelabs.com id 35/A8-27473-C603E535; Mon, 28 Apr 2014 10:41:48 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1398681701!1303545!4 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23918 invoked from network); 28 Apr 2014 10:41:47 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 28 Apr 2014 10:41:47 -0000 X-IronPort-AV: E=Sophos;i="4.97,943,1389744000"; d="scan'208";a="124285762" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 28 Apr 2014 10:41:47 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Mon, 28 Apr 2014 06:41:47 -0400 Received: from kazak.uk.xensource.com ([10.80.2.80] helo=zakaz.uk.xensource.com) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1Wej0L-0007Zt-OH; Mon, 28 Apr 2014 11:41:46 +0100 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Mon, 28 Apr 2014 11:41:45 +0100 From: Ian Campbell To: Date: Mon, 28 Apr 2014 11:41:31 +0100 Message-ID: <1398681696-2773-10-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1398681672.29700.55.camel@kazak.uk.xensource.com> References: <1398681672.29700.55.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST v2 10/15] distros: support booting Debian PV (d-i installed) guests with pvgrub. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: This requires the use of the pv-grub-menu package which is in Jessie onwards. (it is in wheezy-backports which is the subject of a subsequent flight). The bootloader to use is specified via a runvar {Guest}_bootloader. Adjust make-distros-flight to use pvgrub for some subset of i386 and amd64 guests to get coverage. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- Osstest/Debian.pm | 2 +- make-distros-flight | 16 ++++++++++++++++ ts-debian-di-install | 13 +++++++++++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 043ab0d..8946ab1 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -508,7 +508,7 @@ sub preseed_create_guest ($$;@) { my $suite= $xopts{Suite} || $c{DebianSuite}; - my $extra_packages; + my $extra_packages = "pv-grub-menu" if $xopts{PvMenuLst}; my $preseed_file= preseed_base($suite, $extra_packages, %xopts); $preseed_file.= (<{Guest}_arch"}; my $method= $r{"$gho->{Guest}_method"}; + my $bl= $r{"$gho->{Guest}_bootloader"}; + target_cmd_root($ho, <$suite); + $ps_url = preseed_create_guest($gho, '', Suite=>$suite, PvMenuLst=>($bl eq "pvgrub")); $extra_disk = ""; } @@ -149,7 +151,14 @@ END guest_await_shutdown($ho,$gho,2000); guest_destroy($ho,$gho); - my $blcfg = < "/usr/local/lib/xen/boot/pv-grub-x86_32.gz", + amd64 => "/usr/local/lib/xen/boot/pv-grub-x86_64.gz" + }; + my $blcfg = $bl eq "pvgrub" ? <