Bug#787418: Drop " (loader)" suffixes on Microsoft operating systems

[Chris Lamb <lamby@debian.org>]

Package: os-prober
Version: 1.65
Severity: wishlist
Tags: patch

Hi,

Does the " (loader)" suffix on (eg.) Grub menu options really mean
anything? If not, I think it looks much nicer with these suffixes
removed.

(Indeed, the current situation is actually somewhat misleading to the
average user - Linux menu entries don't have these prefixes, encouraging
an end-user to think that they do something other than, well, load/boot
Linux. Especially in a bootloader..)

If the suffix does have some significant meaning, feel free to close
this bug. Patch attached for clarity.


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      lamby@debian.org / chris-lamb.co.uk
       `-

diff --git a/os-probes/mounted/x86/20microsoft b/os-probes/mounted/x86/20microsoft
index 6fb3cc5..a8437d2 100755
--- a/os-probes/mounted/x86/20microsoft
+++ b/os-probes/mounted/x86/20microsoft
@@ -32,21 +32,21 @@ if item_in_dir -q bootmgr "$2"; then
 		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
-				long="Windows 8 (loader)"
+				long="Windows 8"
 			elif grep -qs "W.i.n.d.o.w.s. .7" "$2/$boot/$bcd"; then
-				long="Windows 7 (loader)"
+				long="Windows 7"
 			elif grep -qs "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 -qs "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 -qs "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 -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
-				long="Windows Recovery Environment (loader)"
+				long="Windows Recovery Environment"
 			elif grep -qs "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
 
@@ -82,7 +82,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