Merge lp:~timo-jyrinki/os-prober/trusty_add_win10_to_the_list into lp:ubuntu/trusty-proposed/os-prober

[Timo Jyrinki]

  * os-probes/mounted/x86/20microsoft:
    - add Windows 10 to the list (thanks for David Martin for the patch!)
      (LP: #1482851)

[Timo Jyrinki (timo-jyrinki)]

I managed to get now an access to what's needed to test it, and it seems to fix it - applying it manually in a live session makes it possible to install Ubuntu alongside Win10, otherwise it's not possible.

Likewise with this applied update-grub works correctly after the installation.

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good to me.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-13 11:24:13 +0000
+++ debian/changelog	2015-12-20 20:06:50 +0000
@@ -1,3 +1,11 @@
+os-prober (1.63ubuntu1.1) trusty; urgency=medium
+
+  * os-probes/mounted/x86/20microsoft:
+    - add Windows 10 to the list (thanks for David Martin for the patch!)
+      (LP: #1482851)
+
+ -- Timo Jyrinki <[e-mail]>  Sun, 20 Dec 2015 21:49:21 +0200
+
 os-prober (1.63ubuntu1) trusty; urgency=medium
 
   * Resynchronise with Debian.  Remaining changes:

=== modified file 'os-probes/mounted/x86/20microsoft'
--- os-probes/mounted/x86/20microsoft	2013-05-20 12:42:06 +0000
+++ os-probes/mounted/x86/20microsoft	2015-12-20 20:06:50 +0000
@@ -31,7 +31,9 @@
 	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 "W.i.n.d.o.w.s. .1.0" "$2/$boot/$bcd"; then
+ 				long="Windows 10 (loader)"
+ 			elif grep -qs "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
 				long="Windows 7 (loader)"