X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Flvm.c;h=dbca20b1ce0cba45d3f4c11ea14fb8cc1147e429;hp=0df27e2f0fe6ccf100d056017287c8d79c2364ce;hb=7f16c346bbeba2f2fe3c31ccb85158178a284d84;hpb=6280ac9b987c14f89749b4b4fdfec5a647567432

diff --git a/daemon/lvm.c b/daemon/lvm.c
index 0df27e2..dbca20b 100644
--- a/daemon/lvm.c
+++ b/daemon/lvm.c
@@ -223,10 +223,12 @@ do_vgcreate (const char *volgroup, char *const *physvols)
   if (r == -1) {
     reply_with_error ("%s", err);
     free (err);
+    free (argv);
     return -1;
   }
 
   free (err);
+  free (argv);
 
   udev_settle ();
 
@@ -322,6 +324,12 @@ do_lvm_remove_all (void)
     return -1;
 
   for (i = 0; xs[i] != NULL; ++i) {
+    /* Deactivate the LV first.  On Ubuntu, lvremove '-f' option
+     * does not remove active LVs reliably.
+     */
+    (void) command (NULL, NULL, "lvm", "lvchange", "-an", xs[i], NULL);
+    udev_settle ();
+
     r = command (NULL, &err, "lvm", "lvremove", "-f", xs[i], NULL);
     if (r == -1) {
       reply_with_error ("lvremove: %s: %s", xs[i], err);
@@ -339,6 +347,10 @@ do_lvm_remove_all (void)
     return -1;
 
   for (i = 0; xs[i] != NULL; ++i) {
+    /* Deactivate the VG first, see note above. */
+    (void) command (NULL, NULL, "lvm", "vgchange", "-an", xs[i], NULL);
+    udev_settle ();
+
     r = command (NULL, &err, "lvm", "vgremove", "-f", xs[i], NULL);
     if (r == -1) {
       reply_with_error ("vgremove: %s: %s", xs[i], err);
@@ -502,10 +514,12 @@ do_vg_activate (int activate, char *const *volgroups)
   if (r == -1) {
     reply_with_error ("vgchange: %s", err);
     free (err);
+    free (argv);
     return -1;
   }
 
   free (err);
+  free (argv);
 
   udev_settle ();
 
@@ -664,7 +678,8 @@ do_vgscan (void)
   return 0;
 }
 
-/* Test if a device is a logical volume (RHBZ#619793).
+/* Convert a non-canonical LV path like /dev/mapper/vg-lv or /dev/dm-0
+ * to a canonical one.
  *
  * This is harder than it should be.  A LV device like /dev/VG/LV is
  * really a symlink to a device-mapper device like /dev/dm-0.  However
@@ -675,9 +690,16 @@ do_vgscan (void)
  *
  * Note use of 'stat' instead of 'lstat' so that symlinks are fully
  * resolved.
+ *
+ * Returns:
+ *   1  =  conversion was successful, path is an LV
+ *         '*ret' is set to the updated path if 'ret' is non-NULL.
+ *   0  =  path is not an LV
+ *  -1  =  error, reply_with_* has been called
+ *
  */
 int
-do_is_lv (const char *device)
+lv_canonical (const char *device, char **ret)
 {
   struct stat stat1, stat2;
 
@@ -700,6 +722,14 @@ do_is_lv (const char *device)
       return -1;
     }
     if (stat1.st_rdev == stat2.st_rdev) { /* found it */
+      if (ret) {
+        *ret = strdup (lvs[i]);
+        if (*ret == NULL) {
+          reply_with_perror ("strdup");
+          free_strings (lvs);
+          return -1;
+        }
+      }
       free_strings (lvs);
       return 1;
     }
@@ -709,3 +739,27 @@ do_is_lv (const char *device)
   free_strings (lvs);
   return 0;
 }
+
+/* Test if a device is a logical volume (RHBZ#619793). */
+int
+do_is_lv (const char *device)
+{
+  return lv_canonical (device, NULL);
+}
+
+/* Return canonical name of LV to caller (RHBZ#638899). */
+char *
+do_lvm_canonical_lv_name (const char *device)
+{
+  char *canonical;
+  int r = lv_canonical (device, &canonical);
+  if (r == -1)
+    return NULL;
+
+  if (r == 0) {
+    reply_with_error ("%s: not a logical volume", device);
+    return NULL;
+  }
+
+  return canonical;             /* caller frees */
+}