Merge lp:~tj/ubuntu/trusty/grub-installer/lp1354730 into lp:ubuntu/trusty/grub-installer

[TJ]

Fix installer failure due to grub-probe returning more than one device in the case of BTRS multi-disk RAID volumes.

[Colin Watson (cjwatson)]

12:51 <seb128> cjwatson, hey, do you think you could review https://code.launchpad.net/~tj/ubuntu/trusty/grub-installer/lp1354730/+merge/230222 or maybe suggest somebody who could? that's a one line and is in the sponsoring queue since august
12:52 <cjwatson> seb128: It needs to go into a branch based on lp:~ubuntu-core-dev/grub-installer/ubuntu (except branched for trusty), rather than using the unused UDD branch. But I'm not doing d-i stuff now in general; maybe slangasek can suggest somebody.
12:52 <cjwatson> (Oh and it should use head -n1 not head -1 on general principles)

[Colin Watson (cjwatson)]

Oh, also, the version number will need to be 1.78ubuntu20.1 rather than 1.78ubuntu21. You can see from https://launchpad.net/ubuntu/+source/grub-installer/+publishinghistory that the latter was already used in utopic.

review: Needs Fixing

[Mathieu Trudel-Lapierre (cyphermox)]

It looks like this was in fact breaking grub-installer in some cases in vivid; rejecting. Details are on the bug report.

review: Disapprove

Unmerged revisions

118. By TJ on 2014-08-10

grub_probe(): return a single line in BTRFS multi-disk RAID configurations

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-09 15:20:05 +0000
+++ debian/changelog	2014-08-10 03:53:43 +0000
@@ -1,3 +1,10 @@
+grub-installer (1.78ubuntu21) trusty; urgency=medium
+
+  * grub_probe(): return a single line in BTRFS multi-disk RAID configurations
+    (LP: #1354730).
+
+ -- TJ <[e-mail]>  Sun, 10 Aug 2014 04:47:47 +0100
+
 grub-installer (1.78ubuntu20) trusty; urgency=medium
 
   * Fall back to grub-pc if there is no /target/boot/efi directory (thanks,

=== modified file 'grub-installer'
--- grub-installer	2014-04-09 15:20:05 +0000
+++ grub-installer	2014-08-10 03:53:43 +0000
@@ -113,7 +113,7 @@
 		apt-install grub-common
 		is_grub_common_installed=true
 	fi
-	$chroot $ROOT grub-probe $@
+	$chroot $ROOT grub-probe $@ | head -1
 }
 
 device_map=$ROOT/boot/grub/device.map