From patchwork Thu Jun 23 16:08:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 101647 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 63977B6F93 for ; Fri, 24 Jun 2011 02:08:29 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QZmS1-0001fG-Ak; Thu, 23 Jun 2011 16:08:17 +0000 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QZmRz-0001f7-33 for kernel-team@lists.ubuntu.com; Thu, 23 Jun 2011 16:08:15 +0000 Received: from [10.0.2.5] (host-174-44-148-181.hln-mt.client.bresnan.net [174.44.148.181]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mail.tpi.com (Postfix) with ESMTP id A8CC92B1A4A for ; Thu, 23 Jun 2011 09:08:07 -0700 (PDT) Message-ID: <4E0364E6.9010102@canonical.com> Date: Thu, 23 Jun 2011 10:08:06 -0600 From: Tim Gardner User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110424 Thunderbird/3.1.10 MIME-Version: 1.0 To: Kernel team list Subject: Natty SRU (V2): UBUNTU: [Config] Add grub-efi as a recommended bootloader for server and generic References: <4E0356D9.6080907@canonical.com> In-Reply-To: <4E0356D9.6080907@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list Reply-To: tim.gardner@canonical.com List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com It turns out that the recommended boot loader is first in the list, so in order to preserve the most common choice of grub-pc, swap the order of grub-pc and grub-efi from the previous patch. rtg Acked-by: Andy Whitcroft From e6dc043e9e136f010326c548493bd7157445f9c0 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Thu, 23 Jun 2011 08:55:53 -0600 Subject: [PATCH] UBUNTU: [Config] Add grub-efi as a recommended bootloader for server and generic BugLink: http://bugs.launchpad.net/bugs/800910 Signed-off-by: Tim Gardner --- debian.master/control.d/vars.generic | 2 +- debian.master/control.d/vars.server | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.master/control.d/vars.generic b/debian.master/control.d/vars.generic index 200acfd..8921940 100644 --- a/debian.master/control.d/vars.generic +++ b/debian.master/control.d/vars.generic @@ -2,5 +2,5 @@ arch="i386 amd64" supported="Generic" target="Geared toward desktop systems." desc="x86/x86_64" -bootloader="grub-pc | grub | lilo (>= 19.1)" +bootloader="grub-pc | grub-efi | grub | lilo (>= 19.1)" provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, ndiswrapper-modules-1.9" diff --git a/debian.master/control.d/vars.server b/debian.master/control.d/vars.server index 0f1e41c..80791f1 100644 --- a/debian.master/control.d/vars.server +++ b/debian.master/control.d/vars.server @@ -2,5 +2,5 @@ arch="amd64" supported="Server" target="Geared toward 64 bit server systems." desc="x86_64" -bootloader="grub-pc | grub | lilo (>= 19.1)" +bootloader="grub-pc | grub-efi | grub | lilo (>= 19.1)" provides="redhat-cluster-modules, kvm-api-4, ivtv-modules, ndiswrapper-modules-1.9" -- 1.7.0.4