Ubuntu
grub2 package

Merge lp:~psusi/ubuntu/saucy/grub2/fix-dmraid into lp:ubuntu/saucy/grub2

  1. Saucy (13.10)
  2. fix-dmraid
  3. Merge into saucy
Proposed by Phillip Susi
Status: Merged
Merged at revision: 175
Proposed branch: lp:~psusi/ubuntu/saucy/grub2/fix-dmraid
Merge into: lp:ubuntu/saucy/grub2
Diff against target: 42 lines (+11/-2)
3 files modified
debian/changelog (+9/-0)
debian/patches/restore_mkdevicemap.patch (+1/-1)
util/deviceiter.c (+1/-1)
To merge this branch: bzr merge lp:~psusi/ubuntu/saucy/grub2/fix-dmraid
Reviewer Review Type Date Requested Status
Colin Watson Approve
Ubuntu branches Pending
Review via email: mp+171090@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

This is fine, thanks, and sorry for the delay. I'm not going to merge it directly, though, as I'd much rather retain my sanity by applying changes to non-Ubuntu-specific patches in Debian, so I'll apply it there and round-trip through the Debian archive.

review: Approve

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 2013-05-09 11:38:58 +0000
3+++ debian/changelog 2013-06-24 14:24:35 +0000
4@@ -1,3 +1,12 @@
5+grub2 (2.00-14ubuntu2) saucy; urgency=low
6+
7+ * debian/patches/restore_mkdevicemap.patch: fix dmraid
8+ uuid check to look for "DMRAID-" anywhere instead of
9+ only at the start, since kpartx prefixes it with "partN-".
10+ (LP: #1183915).
11+
12+ -- Phillip Susi <psusi@ubuntu.com> Fri, 24 May 2013 20:09:14 -0400
13+
14 grub2 (2.00-14ubuntu1) saucy; urgency=low
15
16 * Resynchronise with Debian. Remaining changes:
17
18=== modified file 'debian/patches/restore_mkdevicemap.patch'
19--- debian/patches/restore_mkdevicemap.patch 2012-09-27 16:16:51 +0000
20+++ debian/patches/restore_mkdevicemap.patch 2013-06-24 14:24:35 +0000
21@@ -961,7 +961,7 @@
22 + dmraid_check (node_name, "dm_tree_node_get_name failed\n");
23 + node_uuid = dm_tree_node_get_uuid (second);
24 + dmraid_check (node_uuid, "dm_tree_node_get_uuid failed\n");
25-+ if (strncmp (node_uuid, "DMRAID-", 7) != 0)
26++ if (strstr (node_uuid, "DMRAID-") == 0)
27 + {
28 + grub_dprintf ("deviceiter", "%s is not DM-RAID\n", node_name);
29 + goto dmraid_next_child;
30
31=== modified file 'util/deviceiter.c'
32--- util/deviceiter.c 2012-09-27 16:16:51 +0000
33+++ util/deviceiter.c 2013-06-24 14:24:35 +0000
34@@ -913,7 +913,7 @@
35 dmraid_check (node_name, "dm_tree_node_get_name failed\n");
36 node_uuid = dm_tree_node_get_uuid (second);
37 dmraid_check (node_uuid, "dm_tree_node_get_uuid failed\n");
38- if (strncmp (node_uuid, "DMRAID-", 7) != 0)
39+ if (strstr (node_uuid, "DMRAID-") == 0)
40 {
41 grub_dprintf ("deviceiter", "%s is not DM-RAID\n", node_name);
42 goto dmraid_next_child;

Subscribers

People subscribed via source and target branches

to all changes: