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 <tim.gardner@canonical.com>
Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Acked-by: Andy Whitcroft <andy.whitcroft@canonical.com>

diff --git a/debian.master/control.d/vars.generic b/debian.master/control.d/vars.generic
index 200acfd..fd5220f 100644 (file)
--- 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-amd64 | grub-efi-ia32 | 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..b8a53a4 100644 (file)
--- 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-amd64 | grub | lilo (>= 19.1)"
 provides="redhat-cluster-modules, kvm-api-4, ivtv-modules, ndiswrapper-modules-1.9"