diff --git a/os-prober-linux-secure-boot.patch b/os-prober-linux-secure-boot.patch new file mode 100644 index 0000000..98d07ba --- /dev/null +++ b/os-prober-linux-secure-boot.patch @@ -0,0 +1,29 @@ +From: Andrey Borzenkov +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 diff --git a/os-prober.changes b/os-prober.changes index a436e12..11f8dff 100644 --- a/os-prober.changes +++ b/os-prober.changes @@ -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 diff --git a/os-prober.spec b/os-prober.spec index 5c3118b..7353c39 100644 --- a/os-prober.spec +++ b/os-prober.spec @@ -46,6 +46,8 @@ Patch5: os-prober-1.49-grub2-mount.patch Patch6: os-prober-usr_lib-detection.patch # PATCH-FIX-OPENSUSE: Probe also unpartitioned Linux MD devices (bnc#811006) 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/sed @@ -72,6 +74,7 @@ cp %SOURCE1 . %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build make %{?_smp_mflags} CC="%__cc" CFLAGS="%{optflags}"