X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Flvm.c;h=7a05a5402dfdce342bfff0f4478baa1b002d94d9;hp=143c5a810447fe5e468ee655b6a1f5c76137ef30;hb=6c97a65ce768b357a1481cde0533d4cf0b8b931c;hpb=56bef498f46ac3dd580f4bde3c8f3ed2fe688826 diff --git a/daemon/lvm.c b/daemon/lvm.c index 143c5a8..7a05a54 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 @@ -22,17 +22,25 @@ #include #include #include -#include #include "daemon.h" +#include "c-ctype.h" #include "actions.h" +#include "optgroups.h" + +int +optgroup_lvm2_available (void) +{ + int r = access ("/sbin/lvm", X_OK); + return r == 0; +} /* LVM actions. Keep an eye on liblvm, although at the time * of writing it hasn't progressed very far. */ static char ** -convert_lvm_output (char *out, char *prefix) +convert_lvm_output (char *out, const char *prefix) { char *p, *pend; char **r = NULL; @@ -49,12 +57,12 @@ convert_lvm_output (char *out, char *prefix) pend++; } - while (*p && isspace (*p)) /* Skip any leading whitespace. */ + while (*p && c_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])) + while (*p && c_isspace (p[len])) p[len--] = '\0'; if (!*p) { /* Empty line? Skip it. */ @@ -93,7 +101,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 +121,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 +141,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,34 +160,32 @@ 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) +do_pvcreate (const char *device) { char *err; int r; - IS_DEVICE (device, -1); - r = command (NULL, &err, - "/sbin/lvm", "pvcreate", device, NULL); + "/sbin/lvm", "pvcreate", device, NULL); if (r == -1) { reply_with_error ("%s", err); free (err); @@ -187,20 +193,19 @@ do_pvcreate (char *device) } free (err); + + udev_settle (); + return 0; } int -do_vgcreate (char *volgroup, char **physvols) +do_vgcreate (const char *volgroup, char *const *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) { @@ -213,7 +218,7 @@ do_vgcreate (char *volgroup, char **physvols) for (i = 3; i <= argc; ++i) argv[i] = physvols[i-3]; - r = commandv (NULL, &err, argv); + r = commandv (NULL, &err, (const char * const*) argv); if (r == -1) { reply_with_error ("%s", err); free (err); @@ -221,11 +226,14 @@ do_vgcreate (char *volgroup, char **physvols) } free (err); + + udev_settle (); + return 0; } int -do_lvcreate (char *logvol, char *volgroup, int mbytes) +do_lvcreate (const char *logvol, const char *volgroup, int mbytes) { char *err; int r; @@ -234,8 +242,8 @@ do_lvcreate (char *logvol, 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); @@ -243,23 +251,24 @@ do_lvcreate (char *logvol, char *volgroup, int mbytes) } free (err); + + udev_settle (); + return 0; } int -do_lvresize (char *logvol, int mbytes) +do_lvresize (const 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); + "/sbin/lvm", "lvresize", + "-L", size, logvol, NULL); if (r == -1) { reply_with_error ("lvresize: %s", err); free (err); @@ -331,20 +340,20 @@ do_lvm_remove_all (void) } free_strings (xs); + udev_settle (); + /* There, that was easy, sorry about your data. */ return 0; } int -do_lvremove (char *device) +do_lvremove (const char *device) { char *err; int r; - IS_DEVICE (device, -1); - 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); @@ -352,17 +361,20 @@ do_lvremove (char *device) } free (err); + + udev_settle (); + return 0; } int -do_vgremove (char *device) +do_vgremove (const char *device) { char *err; 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); @@ -370,19 +382,20 @@ do_vgremove (char *device) } free (err); + + udev_settle (); + return 0; } int -do_pvremove (char *device) +do_pvremove (const char *device) { char *err; int r; - IS_DEVICE (device, -1); - 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); @@ -390,19 +403,20 @@ do_pvremove (char *device) } free (err); + + udev_settle (); + return 0; } int -do_pvresize (char *device) +do_pvresize (const char *device) { char *err; int r; - IS_DEVICE (device, -1); - 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); @@ -414,7 +428,7 @@ do_pvresize (char *device) } int -do_vg_activate (int activate, char **volgroups) +do_vg_activate (int activate, char *const *volgroups) { char *err; int r, i, argc; @@ -434,7 +448,7 @@ do_vg_activate (int activate, char **volgroups) for (i = 4; i <= argc; ++i) argv[i] = volgroups[i-4]; - r = commandv (NULL, &err, argv); + r = commandv (NULL, &err, (const char * const*) argv); if (r == -1) { reply_with_error ("vgchange: %s", err); free (err); @@ -442,6 +456,9 @@ do_vg_activate (int activate, char **volgroups) } free (err); + + udev_settle (); + return 0; } @@ -451,3 +468,47 @@ do_vg_activate_all (int activate) char *empty[] = { NULL }; return do_vg_activate (activate, empty); } + +int +do_lvrename (const char *logvol, const char *newlogvol) +{ + char *err; + int r; + + r = command (NULL, &err, + "/sbin/lvm", "lvrename", + logvol, newlogvol, NULL); + if (r == -1) { + reply_with_error ("lvrename: %s -> %s: %s", logvol, newlogvol, err); + free (err); + return -1; + } + + free (err); + + udev_settle (); + + return 0; +} + +int +do_vgrename (const char *volgroup, const char *newvolgroup) +{ + char *err; + int r; + + r = command (NULL, &err, + "/sbin/lvm", "vgrename", + volgroup, newvolgroup, NULL); + if (r == -1) { + reply_with_error ("vgrename: %s -> %s: %s", volgroup, newvolgroup, err); + free (err); + return -1; + } + + free (err); + + udev_settle (); + + return 0; +}