Handle probing striped DM-RAID devices (thanks, Robert Collins; LP: #803658).

diff --git a/debian/changelog b/debian/changelog
index a14da11ff16f5b6e43e9a42d20cea8edc185f329..4385298fc65cdce1cc6fe690d3e50bba20ae2ffd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ grub2 (2.00-20) UNRELEASED; urgency=low
     - Sort gnumach kernels in version order (closes: #725451).
   * Move packaging to git, following upstream.  Adjust Vcs-* fields.
   * Remove obsolete DM-Upload-Allowed field.
+  * Merge from Ubuntu:
+    - Handle probing striped DM-RAID devices (thanks, Robert Collins;
+      LP: #803658).
 
  -- Colin Watson <cjwatson@debian.org>  Mon, 07 Oct 2013 09:48:53 +0100
 

diff --git a/debian/patches/probe_dmraid.patch b/debian/patches/probe_dmraid.patch
new file mode 100644 (file)
index 0000000..9563e8f
--- /dev/null
+++ b/debian/patches/probe_dmraid.patch
@@ -0,0 +1,24 @@
+Description: Handle probing striped DM-RAID devices
+Author: Robert Collins <robertc@robertcollins.net>
+Author: Colin Watson <cjwatson@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/803658
+Forwarded: no
+Last-Update: 2013-11-12
+
+Index: b/util/getroot.c
+===================================================================
+--- a/util/getroot.c
++++ b/util/getroot.c
+@@ -1929,6 +1929,12 @@
+             grub_util_info ("%s child has no DM name", path);
+             goto devmapper_out;
+           }
++        if (strstr (child_name, "-") != 0)
++          {
++            grub_util_info ("%s child %s looks like a sub-layer\n",
++                            path, child_name);
++            goto devmapper_out;
++          }
+         mapper_name = child_name;
+ 
+ devmapper_out:

diff --git a/debian/patches/series b/debian/patches/series
index 699e6e23b5e557d491ef7356f369644dd2ffde06..3f4e02bb1136f672eb4ed71b12ed1cd16ba683cf 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -55,3 +55,4 @@ wubi_no_windows.patch
 maybe_quiet.patch
 efidisk_non_512_sectors.patch
 mkconfig_hurd_sort.patch
+probe_dmraid.patch

diff --git a/util/getroot.c b/util/getroot.c
index a218c081e04bbcff6c3da5eb1af6abdf81a59e0e..42c83503ec2e034d0a192e5c1b7501547361916e 100644 (file)
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -1929,6 +1929,12 @@ convert_system_partition_to_system_disk (const char *os_dev, struct stat *st,
              grub_util_info ("%s child has no DM name", path);
              goto devmapper_out;
            }
+         if (strstr (child_name, "-") != 0)
+           {
+             grub_util_info ("%s child %s looks like a sub-layer\n",
+                             path, child_name);
+             goto devmapper_out;
+           }
          mapper_name = child_name;
 
 devmapper_out: