* util/getroot.c (find_root_devices_from_poolname): Handle vdevs

	with full paths.

diff --git a/ChangeLog b/ChangeLog
index b41e6fb3b506ff2e44e71f3a22a20af7ee42e814..5fa574e2eec92ce062f5e58ea54767997836bdbe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-27  Richard Laager <rlaager@wiktel.com>
+
+       * util/getroot.c (find_root_devices_from_poolname): Handle vdevs
+       with full paths.
+
 2012-02-27  Richard Laager <rlaager@wiktel.com>
 
        * util/getroot.c (grub_find_root_devices_from_mountinfo): Add missing

diff --git a/util/getroot.c b/util/getroot.c
index 113f2cfc95d93adc15ab0e7b4f587e85d91ac7ee..2c101b8ba2de35d0afbce92ed2d31ca00a445c83 100644 (file)
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -383,7 +383,10 @@ find_root_devices_from_poolname (char *poolname)
                    devices = xrealloc (devices, sizeof (devices[0])
                                        * devices_allocated);
                  }
-               devices[ndevices++] = xasprintf ("/dev/%s", name);
+               if (name[0] == '/')
+                 devices[ndevices++] = xstrdup (name);
+               else
+                 devices[ndevices++] = xasprintf ("/dev/%s", name);
              }
            break;
          }