Hello community, here is the log from the commit of package os-prober for openSUSE:Factory checked in at 2013-01-20 13:04:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-prober (Old) and /work/SRC/openSUSE:Factory/.os-prober.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2013-01-08 21:11:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2013-01-20 13:04:56.000000000 +0100 @@ -1,0 +2,13 @@ +Sat Jan 19 13:41:59 UTC 2013 - [email protected] + +- 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 - [email protected] + +- add os-prober-1.49-skip-LVM2_member.patch (bnc#798604) + * do not try to mount LVM2 PV + +------------------------------------------------------------------- New: ---- os-prober-1.49-skip-LVM2_member.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-prober.spec ++++++ --- /var/tmp/diff_new_pack.1yh4qD/_old 2013-01-20 13:04:58.000000000 +0100 +++ /var/tmp/diff_new_pack.1yh4qD/_new 2013-01-20 13:04:58.000000000 +0100 @@ -38,6 +38,8 @@ 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 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build make %{?_smp_mflags} CC="%__cc" CFLAGS="%{optflags}" ++++++ os-prober-1.49-fix-grub2.cfg-parsing.patch ++++++ --- /var/tmp/diff_new_pack.1yh4qD/_old 2013-01-20 13:04:58.000000000 +0100 +++ /var/tmp/diff_new_pack.1yh4qD/_new 2013-01-20 13:04:58.000000000 +0100 @@ -85,7 +85,7 @@ # 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 @@ + # 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 } ++++++ os-prober-1.49-skip-LVM2_member.patch ++++++ 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' -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
