Drop " (loader)" suffixes on Microsoft OSes

Closes: #787418

diff --git a/debian/changelog b/debian/changelog
index c72c0cb..99e61a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ os-prober (1.72) UNRELEASED; urgency=medium
   * Add Devuan detection (thanks, David Hare; closes: #801631).
   * Work harder to avoid trying to mount extended partitions (thanks,
     Philippe Coval; closes: #784709).
+  * Drop " (loader)" suffixes on Microsoft operating systems (thanks, Chris
+    Lamb; closes: #787418).
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 31 Dec 2016 17:11:49 +0000
 

diff --git a/os-probes/mounted/x86/20microsoft b/os-probes/mounted/x86/20microsoft
index 1416ddc..06bb807 100755 (executable)
--- a/os-probes/mounted/x86/20microsoft
+++ b/os-probes/mounted/x86/20microsoft
@@ -32,23 +32,23 @@ if item_in_dir -q bootmgr "$2"; then
                bcd=$(item_in_dir bcd "$2/$boot")
                if [ -n "$bcd" ]; then
                        if   grep -aqs "W.i.n.d.o.w.s. .1.0" "$2/$boot/$bcd"; then
-                               long="Windows 10 (loader)"
+                               long="Windows 10"
                        elif grep -aqs "W.i.n.d.o.w.s. .8" "$2/$boot/$bcd"; then
-                               long="Windows 8 (loader)"
+                               long="Windows 8"
                        elif grep -aqs "W.i.n.d.o.w.s. .7" "$2/$boot/$bcd"; then
-                               long="Windows 7 (loader)"
+                               long="Windows 7"
                        elif grep -aqs "W.i.n.d.o.w.s. .V.i.s.t.a" "$2/$boot/$bcd"; then
-                               long="Windows Vista (loader)"
+                               long="Windows Vista"
                        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)"
+                               long="Windows Server 2008 R2"
                        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)"
+                               long="Windows Server 2008"
                        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)"
+                               long="Windows Recovery Environment"
                        elif grep -aqs "W.i.n.d.o.w.s. .S.e.t.u.p" "$2/$boot/$bcd"; then
-                               long="Windows Recovery Environment (loader)"
+                               long="Windows Recovery Environment"
                        else
-                               long="Windows Vista (loader)"
+                               long="Windows Vista"
                        fi
                        short=Windows
 
@@ -84,7 +84,7 @@ if [ -z "$found" ] && item_in_dir -q ntldr "$2" && item_in_dir -q ntdetect.com "
                                long="Windows NT/2000/XP"
                        fi
                else
-                       long="Windows NT/2000/XP (loader)"
+                       long="Windows NT/2000/XP"
                fi
 
                found=true