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

Proposed by TJ on 2014-08-10
Status: Rejected
Rejected by: Mathieu Trudel-Lapierre on 2015-04-03
Proposed branch: lp:~tj/ubuntu/trusty/grub-installer/lp1354730
Merge into: lp:ubuntu/trusty/grub-installer
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/ubuntu/trusty/grub-installer/lp1354730
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2014-08-10 Disapprove on 2015-04-03
Colin Watson 2014-09-29 Needs Fixing on 2015-01-06
Review via email: mp+230222@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.
Colin Watson (cjwatson) wrote :

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

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

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

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 2014-04-09 15:20:05 +0000
3+++ debian/changelog 2014-08-10 03:53:43 +0000
4@@ -1,3 +1,10 @@
5+grub-installer (1.78ubuntu21) trusty; 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> Sun, 10 Aug 2014 04:47:47 +0100
11+
12 grub-installer (1.78ubuntu20) trusty; urgency=medium
13
14 * Fall back to grub-pc if there is no /target/boot/efi directory (thanks,
15
16=== modified file 'grub-installer'
17--- grub-installer 2014-04-09 15:20:05 +0000
18+++ grub-installer 2014-08-10 03:53:43 +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 -1
25 }
26
27 device_map=$ROOT/boot/grub/device.map

Subscribers

People subscribed via source and target branches

to all changes: