Hello community, here is the log from the commit of package os-prober for openSUSE:Factory checked in at 2015-01-27 12:35:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-prober (Old) and /work/SRC/openSUSE:Factory/.os-prober.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober" Changes: -------- --- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2014-12-21 12:03:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2015-01-27 12:35:27.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 26 09:35:55 UTC 2015 - [email protected] + +- add os-prober-grep-for-windows-bcd-file.patch + * fix os-prober misinterprets Windows 8 to be Vista (bsc#910654) + +------------------------------------------------------------------- New: ---- os-prober-grep-for-windows-bcd-file.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-prober.spec ++++++ --- /var/tmp/diff_new_pack.F4wR25/_old 2015-01-27 12:35:28.000000000 +0100 +++ /var/tmp/diff_new_pack.F4wR25/_new 2015-01-27 12:35:28.000000000 +0100 @@ -54,6 +54,8 @@ Patch14: os-prober-skip-part-on-multipath.patch # PATCH-FIX-SLE: fix os-prober: dmraid is called without a device list for every partition (bnc#883453) Patch15: os-prober-call-dmraid-once.patch +# PATCH-FIX-OPENSUSE: fix os-prober misinterprets Windows 8 to be Vista (bsc#910654) +Patch16: os-prober-grep-for-windows-bcd-file.patch Requires: /bin/grep Requires: /bin/sed Requires: /sbin/modprobe @@ -90,6 +92,7 @@ %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 find . -name \*.orig -delete %build ++++++ os-prober-grep-for-windows-bcd-file.patch ++++++ Index: os-prober/os-probes/mounted/x86/20microsoft =================================================================== --- os-prober.orig/os-probes/mounted/x86/20microsoft +++ os-prober/os-probes/mounted/x86/20microsoft @@ -31,19 +31,19 @@ if item_in_dir -q bootmgr "$2"; then for boot in $(item_in_dir boot "$2"); do bcd=$(item_in_dir bcd "$2/$boot") if [ -n "$bcd" ]; then - if grep -qs "W.i.n.d.o.w.s. .8" "$2/$boot/$bcd"; then + if grep -qs --text "W.i.n.d.o.w.s. .8" "$2/$boot/$bcd"; then long="Windows 8 (loader)" - elif grep -qs "W.i.n.d.o.w.s. .7" "$2/$boot/$bcd"; then + elif grep -qs --text "W.i.n.d.o.w.s. .7" "$2/$boot/$bcd"; then long="Windows 7 (loader)" - elif grep -qs "W.i.n.d.o.w.s. .V.i.s.t.a" "$2/$boot/$bcd"; then + elif grep -qs --text "W.i.n.d.o.w.s. .V.i.s.t.a" "$2/$boot/$bcd"; then long="Windows Vista (loader)" - elif grep -qs "W.i.n.d.o.w.s. .S.e.r.v.e.r. .2.0.0.8. .R.2." "$2/$boot/$bcd"; then + elif grep -qs --text "W.i.n.d.o.w.s. .S.e.r.v.e.r. .2.0.0.8. .R.2." "$2/$boot/$bcd"; then long="Windows Server 2008 R2 (loader)" - elif grep -qs "W.i.n.d.o.w.s. .S.e.r.v.e.r. .2.0.0.8." "$2/$boot/$bcd"; then + elif grep -qs --text "W.i.n.d.o.w.s. .S.e.r.v.e.r. .2.0.0.8." "$2/$boot/$bcd"; then long="Windows Server 2008 (loader)" - elif grep -qs "W.i.n.d.o.w.s. .R.e.c.o.v.e.r.y. .E.n.v.i.r.o.n.m.e.n.t" "$2/$boot/$bcd"; then + elif grep -qs --text "W.i.n.d.o.w.s. .R.e.c.o.v.e.r.y. .E.n.v.i.r.o.n.m.e.n.t" "$2/$boot/$bcd"; then long="Windows Recovery Environment (loader)" - elif grep -qs "W.i.n.d.o.w.s. .S.e.t.u.p" "$2/$boot/$bcd"; then + elif grep -qs --text "W.i.n.d.o.w.s. .S.e.t.u.p" "$2/$boot/$bcd"; then long="Windows Recovery Environment (loader)" else long="Windows Vista (loader)" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
