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

Proposed by TJ on 2015-02-18
Status: Merged
Approved by: Mathieu Trudel-Lapierre on 2015-02-19
Approved revision: 1269
Merged at revision: 1269
Proposed branch: lp:~tj/grub-installer/lp1354730
Merge into: lp:~ubuntu-core-dev/grub-installer/ubuntu
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
grub-installer (+1/-1)
To merge this branch: bzr merge lp:~tj/grub-installer/lp1354730
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2015-02-18 Approve on 2015-02-19
Review via email: mp+250100@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Mathieu Trudel-Lapierre (cyphermox) wrote :

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) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-02-03 23:45:22 +0000
3+++ debian/changelog 2015-02-18 08:51:24 +0000
4@@ -1,3 +1,10 @@
5+grub-installer (1.78ubuntu24.1) vivid; urgency=medium
6+
7+ * grub_probe(): return a single line in BTRFS multi-disk RAID configurations
8+ (LP: #1354730).
9+
10+ -- TJ <ubuntu@iam.tj> Tue, 17 Feb 2015 10:00:00 +0000
11+
12 grub-installer (1.78ubuntu24) vivid; urgency=medium
13
14 * Install grub-arm64-efi on arm64/efi platforms. (From Debian)
15
16=== modified file 'grub-installer'
17--- grub-installer 2015-02-03 23:44:55 +0000
18+++ grub-installer 2015-02-18 08:51:24 +0000
19@@ -113,7 +113,7 @@
20 apt-install grub-common
21 is_grub_common_installed=true
22 fi
23- $chroot $ROOT grub-probe $@
24+ $chroot $ROOT grub-probe $@ | head -n1
25 }
26
27 device_map=$ROOT/boot/grub/device.map

Subscribers

People subscribed via source and target branches

to all changes: