* util/getroot.c (find_root_devices_from_poolname): Handle spaces in the

	name.

diff --git a/ChangeLog b/ChangeLog
index b56c00b4033c5b6e05b378bf201aa65cf7d04122..cf926d70893649f817b2509ac82c0c2758ce8505 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/getroot.c (find_root_devices_from_poolname): Handle spaces in the
+       name.
+
 2012-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/net/ip.c (handle_dgram): Fix undeclared variable.

diff --git a/util/getroot.c b/util/getroot.c
index 2d62d63bf800fc725675c5e8da7c267d57ed9435..3955f00374f3767fd59c7132d22dc532a11f410a 100644 (file)
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -380,8 +380,18 @@ find_root_devices_from_poolname (char *poolname)
              st++;
            break;
          case 1:
-           if (!strcmp (name, poolname))
-             st++;
+           {
+             char *ptr = line;
+             while (1)
+               {
+                 if (strncmp (ptr, poolname, strlen (poolname)) == 0
+                     && grub_isspace(ptr[strlen (poolname)]))
+                   st++;
+                 if (!grub_isspace (*ptr))
+                   break;
+                 ptr++;
+               }
+           }
            break;
          case 2:
            if (strcmp (name, "mirror") && !sscanf (name, "mirror-%u", &dummy)