* grub-core/kern/emu/hostdisk.c

	(convert_system_partition_to_system_disk): Don't assume that children
	of mapper nodes are mapper nodes.

diff --git a/ChangeLog b/ChangeLog
index 44882054c9d53f654f7c801af49711fc122073e5..3be8005a75e9cc2c4ff8228f38d357b6db3afcb0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/emu/hostdisk.c
+       (convert_system_partition_to_system_disk): Don't assume that children
+       of mapper nodes are mapper nodes.
+
 2011-10-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/lib/posix_wrap/ctype.h (isxdigit): Use grub_isxdigit.

diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
index a9a8c066ed8f0b422fcb1b0ea8ea35ff74f7fe21..23417a64d6a5f7858326cd6e6dce08b18eac8199 100644 (file)
--- a/grub-core/kern/emu/hostdisk.c
+++ b/grub-core/kern/emu/hostdisk.c
@@ -1416,7 +1416,7 @@ convert_system_partition_to_system_disk (const char *os_dev, struct stat *st)
                  if (tree)
                    dm_tree_free (tree);
                  free (path);
-                 char *ret = grub_find_device ("/dev/mapper",
+                 char *ret = grub_find_device ("/dev",
                                                (major << 8) | minor);
                  return ret;
                }