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.

diff --git a/debian/changelog b/debian/changelog
index 195a3f2..1643099 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+os-prober (1.66) UNRELEASED; urgency=medium
+
+  * Add -a flag to grep -qs for Windows Vista detection. 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
+    (Closes: #791383).
+
+ -- Cyril Brulebois <kibi@debian.org>  Fri, 10 Jul 2015 00:56:21 +0200
+
 os-prober (1.65) unstable; urgency=medium
 
   [ Steve McIntyre ]

diff --git a/os-probes/mounted/x86/20microsoft b/os-probes/mounted/x86/20microsoft
index 6fb3cc5..af83f40 100755 (executable)
--- a/os-probes/mounted/x86/20microsoft
+++ b/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)"