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

[TJ]

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

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good, but the version number really should be 1.78ubuntu25, not 1.78ubuntu24.1. I'll fix that as I merge the changes to not further delay things :)

review: Approve

[TJ (tj)]

On 19/02/15 16:24, Mathieu Trudel-Lapierre wrote:
> Review: Approve
>
> Looks good, but the version number really should be 1.78ubuntu25, not 1.78ubuntu24.1. I'll fix that as I merge the changes to not further delay things :)
>

OK. I was going by Colin Watson's comment in the original M.P. #230222 where he said:

"Oh, also, the version number will need to be 1.78ubuntu20.1 rather than 1.78ubuntu21."

But I think now, looking at it, that was because the ...ubuntu21 had already been used in one of the release branches.

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-03 23:45:22 +0000
+++ debian/changelog	2015-02-18 08:51:24 +0000
@@ -1,3 +1,10 @@
+grub-installer (1.78ubuntu24.1) vivid; urgency=medium
+
+  * grub_probe(): return a single line in BTRFS multi-disk RAID configurations
+    (LP: #1354730).
+
+ -- TJ <[e-mail]>  Tue, 17 Feb 2015 10:00:00 +0000
+
 grub-installer (1.78ubuntu24) vivid; urgency=medium
 
   * Install grub-arm64-efi on arm64/efi platforms. (From Debian)
 
=== modified file 'grub-installer'
--- grub-installer	2015-02-03 23:44:55 +0000
+++ grub-installer	2015-02-18 08:51:24 +0000
@@ -113,7 +113,7 @@
 		apt-install grub-common
 		is_grub_common_installed=true
 	fi
-	$chroot $ROOT grub-probe $@
+	$chroot $ROOT grub-probe $@ | head -n1
 }
 
 device_map=$ROOT/boot/grub/device.map