rpm/os-prober
SHA256
1
0
Fork 0
forked from pool/os-prober
Code Pull Requests Activity

Accepting request 149278 from Base:System

Browse Source 
- fix os-prober-1.49-fix-grub2.cfg-parsing.patch (bnc#799457)
  * initrd was missing
  * entries sometimes were not emitted (forwarded request 149277 from arvidjaar)

OBS-URL: https://build.opensuse.org/request/show/149278
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/os-prober?expand=0&rev=9
This commit is contained in:
Stephan Kulow 2013-01-20 12:04:54 +00:00 committed by Git OBS Bridge
commit 11b932e90c
4 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
os-prober-1.49-fix-grub2.cfg-parsing.patch
View File

@ -85,7 +85,7 @@ Index: os-prober/linux-boot-probes/mounted/common/40grub2
# Hack alert: sed off any (hdn,n) but
# assume the kernel is on the same
# partition.
@@ -73,14 +83,17 @@ parse_grub_menu () {
@@ -73,7 +83,13 @@ parse_grub_menu () {
kernel="/boot$kernel"
fi
;;
@ -94,18 +94,13 @@ Index: os-prober/linux-boot-probes/mounted/common/40grub2
+ # And here we do NOT want to strip off
+ # existing quting, which will be transferred
+ # verbatim in new grub.cfg
+ set -f
+ set -- $line
+ set +f
initrd="$(echo "$2" | sed 's/(.*)//')"
# Initrd same.
if [ "$partition" != "$bootpart" ]; then
initrd="/boot$initrd"
fi
;;
- "}")
+ "}*")
entry_result
;;
esac
@@ -89,11 +102,20 @@ parse_grub_menu () {
@@ -89,11 +105,20 @@ parse_grub_menu () {
entry_result
}

14
os-prober-1.49-skip-LVM2_member.patch Normal file
View File

@ -0,0 +1,14 @@
Index: os-prober/os-probes/common/50mounted-tests
===================================================================
--- os-prober.orig/os-probes/common/50mounted-tests
+++ os-prober/os-probes/common/50mounted-tests
@@ -15,6 +15,9 @@ elif [ "$types" = swap ]; then
elif [ "$types" = crypto_LUKS ]; then
debug "$1 is a LUKS partition; skipping"
exit 0
+elif [ "$types" = LVM2_member ]; then
+ debug "$1 is a LVM2 partition; skipping"
+ exit 0
elif [ "$types" = ntfs ]; then
if type ntfs-3g >/dev/null 2>&1; then
types='ntfs-3g ntfs'

13
os-prober.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Sat Jan 19 13:41:59 UTC 2013 - arvidjaar@gmail.com
- fix os-prober-1.49-fix-grub2.cfg-parsing.patch (bnc#799457)
* initrd was missing
* entries sometimes were not emitted
-------------------------------------------------------------------
Wed Jan 16 18:09:08 UTC 2013 - arvidjaar@gmail.com
- add os-prober-1.49-skip-LVM2_member.patch (bnc#798604)
* do not try to mount LVM2 PV
-------------------------------------------------------------------
Tue Jan 8 07:14:53 UTC 2013 - arvidjaar@gmail.com

3
os-prober.spec
View File

@ -38,6 +38,8 @@ Patch1: os-prober-SUSE.patch
Patch2: os-prober-skip-MS-legacy-on-UEFI.patch
# PATCH-FIX-OPENSUSE: Fix parsing of grub.cfg [bnc#796919]
Patch3: os-prober-1.49-fix-grub2.cfg-parsing.patch
# PATCH-FIX-OPENSUSE: Do not try to mount LVM2 PV [bnc#798604]
Patch4: os-prober-1.49-skip-LVM2_member.patch
Requires: /bin/grep
Requires: /bin/sed
@ -60,6 +62,7 @@ cp %SOURCE1 .
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
make %{?_smp_mflags} CC="%__cc" CFLAGS="%{optflags}"