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

Accepting request 282818 from home:michael-chang:branches:Base:System

Browse Source 
- add os-prober-grep-for-windows-bcd-file.patch
  * fix os-prober misinterprets Windows 8 to be Vista (bsc#910654)

OBS-URL: https://build.opensuse.org/request/show/282818
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=49
This commit is contained in:
Andrei Borzenkov 2015-01-26 10:42:36 +00:00 committed by Git OBS Bridge
parent f596597b43
commit 06d68ed81f
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
os-prober-grep-for-windows-bcd-file.patch Normal file
View File

@ -0,0 +1,31 @@
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)"

6
os-prober.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 26 09:35:55 UTC 2015 - mchang@suse.com
- add os-prober-grep-for-windows-bcd-file.patch
* fix os-prober misinterprets Windows 8 to be Vista (bsc#910654)
-------------------------------------------------------------------
Sun Dec 14 18:16:40 UTC 2014 - tchvatal@suse.com

3
os-prober.spec
View File

@ -54,6 +54,8 @@ Patch13: os-prober-fix-btrfs-subvol-mounted-tests.patch
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 @@ cp %{SOURCE1} .
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
find . -name \*.orig -delete
%build