X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Flvm.c;h=ddc125c93742e90fdf40ee5ddfe6b52de893bdec;hp=63a3e7e59b35423aea1720a14d41e0b7b90c1266;hb=84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0;hpb=85ed8cef99c19b4143844991d14e0b848fecc5da

diff --git a/daemon/lvm.c b/daemon/lvm.c
index 63a3e7e..ddc125c 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
@@ -32,7 +32,7 @@
  */
 
 static char **
-convert_lvm_output (char *out, char *prefix)
+convert_lvm_output (char *out, const char *prefix)
 {
   char *p, *pend;
   char **r = NULL;
@@ -93,7 +93,7 @@ do_pvs (void)
   int r;
 
   r = command (&out, &err,
-	       "/sbin/lvm", "pvs", "-o", "pv_name", "--noheadings", NULL);
+               "/sbin/lvm", "pvs", "-o", "pv_name", "--noheadings", NULL);
   if (r == -1) {
     reply_with_error ("%s", err);
     free (out);
@@ -113,7 +113,7 @@ do_vgs (void)
   int r;
 
   r = command (&out, &err,
-	       "/sbin/lvm", "vgs", "-o", "vg_name", "--noheadings", NULL);
+               "/sbin/lvm", "vgs", "-o", "vg_name", "--noheadings", NULL);
   if (r == -1) {
     reply_with_error ("%s", err);
     free (out);
@@ -133,9 +133,9 @@ do_lvs (void)
   int r;
 
   r = command (&out, &err,
-	       "/sbin/lvm", "lvs",
-	       "-o", "vg_name,lv_name", "--noheadings",
-	       "--separator", "/", NULL);
+               "/sbin/lvm", "lvs",
+               "-o", "vg_name,lv_name", "--noheadings",
+               "--separator", "/", NULL);
   if (r == -1) {
     reply_with_error ("%s", err);
     free (out);
@@ -152,19 +152,19 @@ 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 ();
@@ -177,7 +177,7 @@ do_pvcreate (const char *device)
   int r;
 
   r = command (NULL, &err,
-	       "/sbin/lvm", "pvcreate", device, NULL);
+               "/sbin/lvm", "pvcreate", device, NULL);
   if (r == -1) {
     reply_with_error ("%s", err);
     free (err);
@@ -185,16 +185,23 @@ do_pvcreate (const char *device)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }
 
 int
-do_vgcreate (const char *volgroup, char * const* const physvols)
+do_vgcreate (const 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)
+    RESOLVE_DEVICE (physvols[i], return -1);
+
   argc = count_strings (physvols) + 3;
   argv = malloc (sizeof (char *) * (argc + 1));
   if (argv == NULL) {
@@ -215,6 +222,9 @@ do_vgcreate (const char *volgroup, char * const* const physvols)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }
 
@@ -228,8 +238,8 @@ do_lvcreate (const char *logvol, const char *volgroup, int mbytes)
   snprintf (size, sizeof size, "%d", mbytes);
 
   r = command (NULL, &err,
-	       "/sbin/lvm", "lvcreate",
-	       "-L", size, "-n", logvol, volgroup, NULL);
+               "/sbin/lvm", "lvcreate",
+               "-L", size, "-n", logvol, volgroup, NULL);
   if (r == -1) {
     reply_with_error ("%s", err);
     free (err);
@@ -237,6 +247,31 @@ do_lvcreate (const char *logvol, const char *volgroup, int mbytes)
   }
 
   free (err);
+
+  udev_settle ();
+
+  return 0;
+}
+
+int
+do_lvresize (const char *logvol, int mbytes)
+{
+  char *err;
+  int r;
+  char size[64];
+
+  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;
 }
 
@@ -301,6 +336,8 @@ do_lvm_remove_all (void)
   }
   free_strings (xs);
 
+  udev_settle ();
+
   /* There, that was easy, sorry about your data. */
   return 0;
 }
@@ -312,7 +349,7 @@ do_lvremove (const char *device)
   int r;
 
   r = command (NULL, &err,
-	       "/sbin/lvm", "lvremove", "-f", device, NULL);
+               "/sbin/lvm", "lvremove", "-f", device, NULL);
   if (r == -1) {
     reply_with_error ("%s", err);
     free (err);
@@ -320,6 +357,9 @@ do_lvremove (const char *device)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }
 
@@ -330,7 +370,7 @@ do_vgremove (const char *device)
   int r;
 
   r = command (NULL, &err,
-	       "/sbin/lvm", "vgremove", "-f", device, NULL);
+               "/sbin/lvm", "vgremove", "-f", device, NULL);
   if (r == -1) {
     reply_with_error ("%s", err);
     free (err);
@@ -338,6 +378,9 @@ do_vgremove (const char *device)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }
 
@@ -348,7 +391,7 @@ do_pvremove (const char *device)
   int r;
 
   r = command (NULL, &err,
-	       "/sbin/lvm", "pvremove", "-ff", device, NULL);
+               "/sbin/lvm", "pvremove", "-ff", device, NULL);
   if (r == -1) {
     reply_with_error ("%s", err);
     free (err);
@@ -356,6 +399,9 @@ do_pvremove (const char *device)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }
 
@@ -366,7 +412,7 @@ do_pvresize (const char *device)
   int r;
 
   r = command (NULL, &err,
-	       "/sbin/lvm", "pvresize", device, NULL);
+               "/sbin/lvm", "pvresize", device, NULL);
   if (r == -1) {
     reply_with_error ("pvresize: %s: %s", device, err);
     free (err);
@@ -378,7 +424,7 @@ do_pvresize (const char *device)
 }
 
 int
-do_vg_activate (int activate, char * const* const volgroups)
+do_vg_activate (int activate, char **volgroups)
 {
   char *err;
   int r, i, argc;
@@ -406,6 +452,9 @@ do_vg_activate (int activate, char * const* const volgroups)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }