rpms/efibootmgr/devel efibootmgr-0.5.4-default-to-grub.patch, NONE, 1.1 efibootmgr.spec, 1.9, 1.10

[Peter Jones]

Author: pjones

Update of /cvs/extras/rpms/efibootmgr/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26846

Modified Files:
	efibootmgr.spec 
Added Files:
	efibootmgr-0.5.4-default-to-grub.patch 
Log Message:
* Wed Apr 14 2010 Peter Jones <pjones at redhat.com> - 0.5.4-8
- Make \EFI\redhat\grub.efi the default bootloader
  Resolves: rhbz#579665


efibootmgr-0.5.4-default-to-grub.patch:
 efibootmgr.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE efibootmgr-0.5.4-default-to-grub.patch ---
>From 836e58668167e82c5ffcb66f3f390d2c52217f6a Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones at redhat.com>
Date: Wed, 14 Apr 2010 16:06:48 -0400
Subject: [PATCH] Make \EFI\redhat\grub.efi the default bootloader (#579665)

Make \EFI\redhat\grub.efi the default bootloader instead of \elilo.efi .
---
 src/efibootmgr/efibootmgr.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c
index 5db0d9e..b984143 100644
--- a/src/efibootmgr/efibootmgr.c
+++ b/src/efibootmgr/efibootmgr.c
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 
-  This must tie the EFI_DEVICE_PATH to /boot/efi/elilo.efi
+  This must tie the EFI_DEVICE_PATH to /boot/efi/EFI/redhat/grub.efi
   The  EFI_DEVICE_PATH will look something like:
     ACPI device path, length 12 bytes
     Hardware Device Path, PCI, length 6 bytes
@@ -779,7 +779,7 @@ usage()
 	printf("\t-g | --gpt            force disk with invalid PMBR to be treated as GPT\n");
 	printf("\t-H | --acpi_hid XXXX  set the ACPI HID (used with -i)\n");
 	printf("\t-i | --iface name     create a netboot entry for the named interface\n");
-	printf("\t-l | --loader name     (defaults to \\elilo.efi)\n");
+	printf("\t-l | --loader name     (defaults to \\EFI\\redhat\\grub.efi)\n");
 	printf("\t-L | --label label     Boot manager display label (defaults to \"Linux\")\n");
 	printf("\t-n | --bootnext XXXX   set BootNext to XXXX (hex)\n");
 	printf("\t-N | --delete-bootnext delete BootNext\n");
@@ -807,7 +807,7 @@ set_default_opts()
 	opts.active          = -1;   /* Don't set it */
 	opts.timeout         = -1;   /* Don't set it */
 	opts.edd10_devicenum = 0x80;
-	opts.loader          = "\\elilo.efi";
+	opts.loader          = "\\EFI\\redhat\\grub.efi";
 	opts.label           = "Linux";
 	opts.disk            = "/dev/sda";
 	opts.iface           = NULL;
-- 
1.7.0.1



Index: efibootmgr.spec
===================================================================
RCS file: /cvs/extras/rpms/efibootmgr/devel/efibootmgr.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- efibootmgr.spec	24 Jul 2009 21:04:13 -0000	1.9
+++ efibootmgr.spec	14 Apr 2010 20:11:06 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: EFI Boot Manager
 Name: efibootmgr
 Version: 0.5.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://linux.dell.com/%{name}/
@@ -15,6 +15,7 @@ Conflicts: elilo <= 3.6-5
 Obsoletes: elilo <= 3.6-5
 
 Source0: http://linux.dell.com/%{name}/permalink/%{name}-%{version}.tar.gz
+Patch0: efibootmgr-0.5.4-default-to-grub.patch
 
 %description
 %{name} displays and allows the user to edit the Intel Extensible
@@ -24,6 +25,7 @@ http://developer.intel.com/technology/ef
 
 %prep
 %setup -q
+%patch0 -p1 -b .grub-default
 
 %build
 make %{?_smp_mflags} EXTRA_CFLAGS='%{optflags}'
@@ -46,6 +48,10 @@ rm -rf %{buildroot}
 %doc README INSTALL COPYING
     
 %changelog
+* Wed Apr 14 2010 Peter Jones <pjones at redhat.com> - 0.5.4-8
+- Make \EFI\redhat\grub.efi the default bootloader
+  Resolves: rhbz#579665
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild