X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Flvm.c;h=01b6435e0f12b9d7d7f1522bec0a1bb9ac979176;hp=bc38547449208654e9f2611f67275f609f7f7c9c;hb=6279c4bbf9cbbe66917ce9ffa4b98eca9040bcd9;hpb=6085137e65cb63aaf725207f2929a571d1149420

diff --git a/daemon/lvm.c b/daemon/lvm.c
index bc38547..01b6435 100644
--- a/daemon/lvm.c
+++ b/daemon/lvm.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc. 
+ * Copyright (C) 2009 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,6 +37,7 @@ convert_lvm_output (char *out, char *prefix)
   char *p, *pend;
   char **r = NULL;
   int size = 0, alloc = 0;
+  int len;
   char buf[256];
   char *str;
 
@@ -51,6 +52,11 @@ convert_lvm_output (char *out, char *prefix)
     while (*p && isspace (*p))	/* Skip any leading whitespace. */
       p++;
 
+    /* Sigh, skip trailing whitespace too.  "pvs", I'm looking at you. */
+    len = strlen (p)-1;
+    while (*p && isspace (p[len]))
+      p[len--] = '\0';
+
     if (!*p) {			/* Empty line?  Skip it. */
       p = pend;
       continue;
@@ -146,20 +152,325 @@ do_lvs (void)
  * the code.  That code is in stubs.c, and it is generated as usual
  * by generator.ml.
  */
-guestfs_lvm_int_pv_list *
+guestfs_int_lvm_pv_list *
 do_pvs_full (void)
 {
   return parse_command_line_pvs ();
 }
 
-guestfs_lvm_int_vg_list *
+guestfs_int_lvm_vg_list *
 do_vgs_full (void)
 {
   return parse_command_line_vgs ();
 }
 
-guestfs_lvm_int_lv_list *
+guestfs_int_lvm_lv_list *
 do_lvs_full (void)
 {
   return parse_command_line_lvs ();
 }
+
+int
+do_pvcreate (char *device)
+{
+  char *err;
+  int r;
+
+  IS_DEVICE (device, -1);
+
+  r = command (NULL, &err,
+	       "/sbin/lvm", "pvcreate", device, NULL);
+  if (r == -1) {
+    reply_with_error ("%s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+
+  udev_settle ();
+
+  return 0;
+}
+
+int
+do_vgcreate (char *volgroup, char **physvols)
+{
+  char *err;
+  int r, argc, i;
+  const char **argv;
+
+  /* Check they are devices and also do device name translation. */
+  for (i = 0; physvols[i] != NULL; ++i)
+    IS_DEVICE (physvols[i], -1);
+
+  argc = count_strings (physvols) + 3;
+  argv = malloc (sizeof (char *) * (argc + 1));
+  if (argv == NULL) {
+    reply_with_perror ("malloc");
+    return -1;
+  }
+  argv[0] = "/sbin/lvm";
+  argv[1] = "vgcreate";
+  argv[2] = volgroup;
+  for (i = 3; i <= argc; ++i)
+    argv[i] = physvols[i-3];
+
+  r = commandv (NULL, &err, argv);
+  if (r == -1) {
+    reply_with_error ("%s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+
+  udev_settle ();
+
+  return 0;
+}
+
+int
+do_lvcreate (char *logvol, char *volgroup, int mbytes)
+{
+  char *err;
+  int r;
+  char size[64];
+
+  snprintf (size, sizeof size, "%d", mbytes);
+
+  r = command (NULL, &err,
+	       "/sbin/lvm", "lvcreate",
+	       "-L", size, "-n", logvol, volgroup, NULL);
+  if (r == -1) {
+    reply_with_error ("%s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+
+  udev_settle ();
+
+  return 0;
+}
+
+int
+do_lvresize (char *logvol, int mbytes)
+{
+  char *err;
+  int r;
+  char size[64];
+
+  IS_DEVICE (logvol, -1);
+
+  snprintf (size, sizeof size, "%d", mbytes);
+
+  r = command (NULL, &err,
+	       "/sbin/lvm", "lvresize",
+	       "-L", size, logvol, NULL);
+  if (r == -1) {
+    reply_with_error ("lvresize: %s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+  return 0;
+}
+
+/* Super-dangerous command used for testing.  It removes all
+ * LVs, VGs and PVs permanently.
+ */
+int
+do_lvm_remove_all (void)
+{
+  char **xs;
+  int i, r;
+  char *err;
+
+  /* Remove LVs. */
+  xs = do_lvs ();
+  if (xs == NULL)
+    return -1;
+
+  for (i = 0; xs[i] != NULL; ++i) {
+    r = command (NULL, &err, "/sbin/lvm", "lvremove", "-f", xs[i], NULL);
+    if (r == -1) {
+      reply_with_error ("lvremove: %s: %s", xs[i], err);
+      free (err);
+      free_strings (xs);
+      return -1;
+    }
+    free (err);
+  }
+  free_strings (xs);
+
+  /* Remove VGs. */
+  xs = do_vgs ();
+  if (xs == NULL)
+    return -1;
+
+  for (i = 0; xs[i] != NULL; ++i) {
+    r = command (NULL, &err, "/sbin/lvm", "vgremove", "-f", xs[i], NULL);
+    if (r == -1) {
+      reply_with_error ("vgremove: %s: %s", xs[i], err);
+      free (err);
+      free_strings (xs);
+      return -1;
+    }
+    free (err);
+  }
+  free_strings (xs);
+
+  /* Remove PVs. */
+  xs = do_pvs ();
+  if (xs == NULL)
+    return -1;
+
+  for (i = 0; xs[i] != NULL; ++i) {
+    r = command (NULL, &err, "/sbin/lvm", "pvremove", "-f", xs[i], NULL);
+    if (r == -1) {
+      reply_with_error ("pvremove: %s: %s", xs[i], err);
+      free (err);
+      free_strings (xs);
+      return -1;
+    }
+    free (err);
+  }
+  free_strings (xs);
+
+  udev_settle ();
+
+  /* There, that was easy, sorry about your data. */
+  return 0;
+}
+
+int
+do_lvremove (char *device)
+{
+  char *err;
+  int r;
+
+  IS_DEVICE (device, -1);
+
+  r = command (NULL, &err,
+	       "/sbin/lvm", "lvremove", "-f", device, NULL);
+  if (r == -1) {
+    reply_with_error ("%s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+
+  udev_settle ();
+
+  return 0;
+}
+
+int
+do_vgremove (char *device)
+{
+  char *err;
+  int r;
+
+  r = command (NULL, &err,
+	       "/sbin/lvm", "vgremove", "-f", device, NULL);
+  if (r == -1) {
+    reply_with_error ("%s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+
+  udev_settle ();
+
+  return 0;
+}
+
+int
+do_pvremove (char *device)
+{
+  char *err;
+  int r;
+
+  IS_DEVICE (device, -1);
+
+  r = command (NULL, &err,
+	       "/sbin/lvm", "pvremove", "-ff", device, NULL);
+  if (r == -1) {
+    reply_with_error ("%s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+
+  udev_settle ();
+
+  return 0;
+}
+
+int
+do_pvresize (char *device)
+{
+  char *err;
+  int r;
+
+  IS_DEVICE (device, -1);
+
+  r = command (NULL, &err,
+	       "/sbin/lvm", "pvresize", device, NULL);
+  if (r == -1) {
+    reply_with_error ("pvresize: %s: %s", device, err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+  return 0;
+}
+
+int
+do_vg_activate (int activate, char **volgroups)
+{
+  char *err;
+  int r, i, argc;
+  const char **argv;
+
+  argc = count_strings (volgroups) + 4;
+  argv = malloc (sizeof (char *) * (argc+1));
+  if (argv == NULL) {
+    reply_with_perror ("malloc");
+    return -1;
+  }
+
+  argv[0] = "/sbin/lvm";
+  argv[1] = "vgchange";
+  argv[2] = "-a";
+  argv[3] = activate ? "y" : "n";
+  for (i = 4; i <= argc; ++i)
+    argv[i] = volgroups[i-4];
+
+  r = commandv (NULL, &err, argv);
+  if (r == -1) {
+    reply_with_error ("vgchange: %s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+
+  udev_settle ();
+
+  return 0;
+}
+
+int
+do_vg_activate_all (int activate)
+{
+  char *empty[] = { NULL };
+  return do_vg_activate (activate, empty);
+}