File os-prober-grep-for-windows-bcd-file.patch of Package os-prober.1605
From 15dec5c28b77b6db1492e42e25946cd7ae7a7885 Mon Sep 17 00:00:00 2001 From: Cyril Brulebois <kibi@debian.org> Date: Fri, 10 Jul 2015 00:59:38 +0200 Subject: [PATCH] Add -a flag to grep -qs for Windows Vista detection (Closes: #791383). It appears the file isn't always considered as a text file, so this should be more robust. Thanks to Gianluigi Tiesi for the report and the suggestion. --- debian/changelog | 9 +++++++++ os-probes/mounted/x86/20microsoft | 14 +++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) Index: os-prober-1.61/os-probes/mounted/x86/20microsoft =================================================================== --- os-prober-1.61.orig/os-probes/mounted/x86/20microsoft +++ os-prober-1.61/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 -aqs "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 -aqs "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 -aqs "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 -aqs "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 -aqs "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 -aqs "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 -aqs "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)"
