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);
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);
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
*
* 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;
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;
}
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 */
+}