pool/os-prober
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 162966 from home:arvidjaar:bnc:810912

Browse Source 
- add os-prober-linux-secure-boot.patch (bnc#810912)
  * recognize linuxefi/initrdefi too

OBS-URL: https://build.opensuse.org/request/show/162966
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=25
This commit is contained in:
Dr. Werner Fink 2013-04-06 14:41:21 +00:00 committed by Git OBS Bridge
parent 5f1f8cb2d4
commit fdc43a782b
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
os-prober-linux-secure-boot.patch Normal file
View File

@ -0,0 +1,29 @@
From: Andrey Borzenkov <arvidjaar@gmail.com>
Subject: detect linuxefi/initrdefi secure bootloaders too
Reference: bnc#810912
Recognize initrdefi and linuxefi too. Whether linux/initrd or
linuxefi/initrdefi will be emitted is controlled by SECURE_BOOT
setting in /etc/sysconfig/bootloader.
Index: os-prober/linux-boot-probes/mounted/common/40grub2
===================================================================
--- os-prober.orig/linux-boot-probes/mounted/common/40grub2
+++ os-prober/linux-boot-probes/mounted/common/40grub2
@@ -64,7 +64,7 @@ parse_grub_menu () {
ignore_item=1
fi
;;
- linux[" "]*)
+ linux[" "]*|linuxefi[" "]*)
# And here we do NOT want to strip off
# existing quting, which will be transferred
# verbatim in new grub.cfg
@@ -83,7 +83,7 @@ parse_grub_menu () {
kernel="/boot$kernel"
fi
;;
- initrd[" "]*)
+ initrd[" "]*|initrdefi[" "]*)
# And here we do NOT want to strip off
# existing quting, which will be transferred
# verbatim in new grub.cfg

6
os-prober.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 5 16:33:28 UTC 2013 - arvidjaar@gmail.com
- add os-prober-linux-secure-boot.patch (bnc#810912)
* recognize linuxefi/initrdefi too
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 22 17:29:32 UTC 2013 - arvidjaar@gmail.com Fri Mar 22 17:29:32 UTC 2013 - arvidjaar@gmail.com

3
os-prober.spec
View File

@ -46,6 +46,8 @@ Patch5: os-prober-1.49-grub2-mount.patch
Patch6: os-prober-usr_lib-detection.patch Patch6: os-prober-usr_lib-detection.patch
# PATCH-FIX-OPENSUSE: Probe also unpartitioned Linux MD devices (bnc#811006) # PATCH-FIX-OPENSUSE: Probe also unpartitioned Linux MD devices (bnc#811006)
Patch7: os-prober-probe-MD-devices.patch Patch7: os-prober-probe-MD-devices.patch
# PATCH-FIX-OPENSUSE: Detect linux secure boot entries too (bnc#810912)
Patch8: os-prober-linux-secure-boot.patch
Requires: /bin/grep Requires: /bin/grep
Requires: /bin/sed Requires: /bin/sed
@ -72,6 +74,7 @@ cp %SOURCE1 .
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch7 -p1 %patch7 -p1
%patch8 -p1
%build %build
make %{?_smp_mflags} CC="%__cc" CFLAGS="%{optflags}" make %{?_smp_mflags} CC="%__cc" CFLAGS="%{optflags}"