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

diff --git a/daemon/lvm.c b/daemon/lvm.c
index c30d4e7..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
@@ -152,26 +152,26 @@ 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 (const char *device)
+do_pvcreate (char *device)
 {
   char *err;
   int r;
@@ -187,17 +187,22 @@ do_pvcreate (const char *device)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }
 
 int
-do_vgcreate (const char *volgroup, char * const* const physvols)
+do_vgcreate (char *volgroup, char **physvols)
 {
   char *err;
   int r, argc, i;
   const char **argv;
 
-  Xphysvols;
+  /* 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));
@@ -219,11 +224,14 @@ do_vgcreate (const char *volgroup, char * const* const physvols)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }
 
 int
-do_lvcreate (const char *logvol, const char *volgroup, int mbytes)
+do_lvcreate (char *logvol, char *volgroup, int mbytes)
 {
   char *err;
   int r;
@@ -241,11 +249,14 @@ do_lvcreate (const char *logvol, const char *volgroup, int mbytes)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }
 
 int
-do_lvresize (const char *logvol, int mbytes)
+do_lvresize (char *logvol, int mbytes)
 {
   char *err;
   int r;
@@ -329,12 +340,14 @@ do_lvm_remove_all (void)
   }
   free_strings (xs);
 
+  udev_settle ();
+
   /* There, that was easy, sorry about your data. */
   return 0;
 }
 
 int
-do_lvremove (const char *device)
+do_lvremove (char *device)
 {
   char *err;
   int r;
@@ -350,17 +363,18 @@ do_lvremove (const char *device)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }
 
 int
-do_vgremove (const char *device)
+do_vgremove (char *device)
 {
   char *err;
   int r;
 
-  IS_DEVICE (device, -1);
-
   r = command (NULL, &err,
 	       "/sbin/lvm", "vgremove", "-f", device, NULL);
   if (r == -1) {
@@ -370,11 +384,14 @@ do_vgremove (const char *device)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }
 
 int
-do_pvremove (const char *device)
+do_pvremove (char *device)
 {
   char *err;
   int r;
@@ -390,11 +407,14 @@ do_pvremove (const char *device)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }
 
 int
-do_pvresize (const char *device)
+do_pvresize (char *device)
 {
   char *err;
   int r;
@@ -414,7 +434,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;
@@ -442,6 +462,9 @@ do_vg_activate (int activate, char * const* const volgroups)
   }
 
   free (err);
+
+  udev_settle ();
+
   return 0;
 }