3117d284d2
- Update to 14 plus upstream fixes. (fate#322108) - Forward port and refresh SLE patches OBS-URL: https://build.opensuse.org/request/show/477131 OBS-URL: https://build.opensuse.org/package/show/Base:System/efibootmgr?expand=0&rev=37
84 lines
3.0 KiB
Diff
84 lines
3.0 KiB
Diff
From: Raymund Will <rw@suse.com>
|
|
Subject: Make default '--loader' build-time configurable.
|
|
|
|
Each distribution uses a specific 'vendor'-directory in the
|
|
'efi' directory on the EFI System Partition to store their
|
|
EFI loader. There's little use in hardcoding the value
|
|
for just one in 'efibootmgr', which is displayed in '--help'
|
|
and used as default without '--loader'.
|
|
|
|
Simply use
|
|
make OS_VENDOR=<vendor> EFI_LOADER=<loader>.efi
|
|
to get the desired value. :)
|
|
|
|
Signed-off-by: Raymund Will <rw@suse.com>
|
|
---
|
|
Make.defaults | 4 ++++
|
|
src/efibootmgr.c | 9 +++++----
|
|
2 files changed, 9 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Make.defaults b/Make.defaults
|
|
index 0ac50ef..7ca17e3 100644
|
|
--- a/Make.defaults
|
|
+++ b/Make.defaults
|
|
@@ -9,6 +9,9 @@ localedir ?= $(datadir)/locale/
|
|
PCDIR ?= $(libdir)/pkgconfig
|
|
DESTDIR ?=
|
|
|
|
+OS_VENDOR := redhat
|
|
+EFI_LOADER := grub.efi
|
|
+
|
|
INSTALL ?= install
|
|
CROSS_COMPILE ?=
|
|
PKG_CONFIG = $(CROSS_COMPILE)pkg-config
|
|
@@ -29,6 +32,7 @@ cflags = $(CFLAGS) $(SUBDIR_CFLAGS) \
|
|
-std=gnu11 -fPIC \
|
|
-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLOCALEDIR=\"$(localedir)\" \
|
|
-DEFIBOOTMGR_VERSION="\"$(VERSION)\"" \
|
|
+ -DDEFAULT_LOADER=\"\\\\efi\\\\$(OS_VENDOR)\\\\$(EFI_LOADER)\" \
|
|
$(if $(findstring clang,$(CC)),$(clang_cflags),) \
|
|
$(if $(findstring gcc,$(CC)),$(gcc_cflags),) \
|
|
$(call pkg-config-cflags)
|
|
diff --git a/src/efibootmgr.c b/src/efibootmgr.c
|
|
index 20d71e2..825435e 100644
|
|
--- a/src/efibootmgr.c
|
|
+++ b/src/efibootmgr.c
|
|
@@ -1,5 +1,6 @@
|
|
/*
|
|
- efibootmgr.c - Manipulates EFI variables as exported in /proc/efi/vars
|
|
+ efibootmgr.c - Manipulates EFI variables as exported in /sys/firmware/efi/
|
|
+ efivars or vars (previously /proc/efi/vars)
|
|
|
|
Copyright (C) 2001-2004 Dell, Inc. <Matt_Domsch@dell.com>
|
|
|
|
@@ -18,7 +19,7 @@
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
|
|
- This must tie the EFI_DEVICE_PATH to /boot/efi/EFI/redhat/grub.efi
|
|
+ This must tie the EFI_DEVICE_PATH to /boot/efi/EFI/<vendor>/<loader>.efi
|
|
The EFI_DEVICE_PATH will look something like:
|
|
ACPI device path, length 12 bytes
|
|
Hardware Device Path, PCI, length 6 bytes
|
|
@@ -1233,7 +1234,7 @@ usage()
|
|
printf("\t --ip-port <local>,<remote> set local and remote IP ports\n");
|
|
printf("\t --ip-origin { {dhcp|static} | { static|stateless|stateful} }\n");
|
|
#endif
|
|
- printf("\t-l | --loader name (defaults to \\EFI\\redhat\\grub.efi)\n");
|
|
+ printf("\t-l | --loader name (defaults to \""DEFAULT_LOADER"\")\n");
|
|
printf("\t-L | --label label Boot manager display label (defaults to \"Linux\")\n");
|
|
printf("\t-m | --mirror-below-4G t|f mirror memory below 4GB\n");
|
|
printf("\t-M | --mirror-above-4G X percentage memory to mirror above 4GB\n");
|
|
@@ -1263,7 +1264,7 @@ set_default_opts()
|
|
opts.active = -1; /* Don't set it */
|
|
opts.timeout = -1; /* Don't set it */
|
|
opts.edd10_devicenum = 0x80;
|
|
- opts.loader = "\\EFI\\redhat\\grub.efi";
|
|
+ opts.loader = DEFAULT_LOADER;
|
|
opts.label = (unsigned char *)"Linux";
|
|
opts.disk = "/dev/sda";
|
|
opts.part = 1;
|
|
--
|
|
2.6.6
|
|
|