From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST v2 3/7] ts-debian-di-install: Install pv-grub-menu in ARM guests, always. Date: Thu, 13 Aug 2015 17:52:37 +0100 Message-ID: <1439484761-13511-3-git-send-email-ian.campbell@citrix.com> References: <1439484752.23981.124.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1439484752.23981.124.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com, xen-devel@lists.xen.org Cc: Ian Campbell List-Id: xen-devel@lists.xenproject.org Signed-off-by: Ian Campbell --- v2: s/pv-menu-lst/pv-grub-menu/ Add note that pvgrub == grub1 Ungarble a comment --- ts-debian-di-install | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ts-debian-di-install b/ts-debian-di-install index 612e0fa..eef4681 100755 --- a/ts-debian-di-install +++ b/ts-debian-di-install @@ -190,9 +190,20 @@ END $method_cfg = setup_netboot($tmpdir, $arch, $suite); + # We need the pv-grub-menu package: + # - On x86 when running pvgrub, since pvgrub only speaks grub1 + # menu.lst syntax and grub2 is now the only grub in + # Debian. + # - On ARM, which uses pygrub, because grub2 is not installed + # on ARM by default (except for, maybe, UEFI guests in the + # future, but not today). + # + # NB: "pvgrub" is grub1/grub-legacy, not PV grub2. + my $pvmenulst = ($bl eq "pvgrub" || $arch =~ /arm/); + $ps_url = preseed_create_guest($gho, $arch, '', Suite=>$suite, - PvMenuLst=>($bl eq "pvgrub")); + PvMenuLst=>$pvmenulst); $extra_disk = ""; } -- 2.1.4