fish: Add guestfish -N lv for creating disks with LVs.

diff --git a/fish/Makefile.am b/fish/Makefile.am
index fa8068a..d5c1dab 100644 (file)
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -54,6 +54,7 @@ guestfish_SOURCES = \
        prep_disk.c \
        prep_part.c \
        prep_fs.c \
+       prep_lv.c \
        progress.c \
        rc.c \
        reopen.c \

diff --git a/fish/prep_lv.c b/fish/prep_lv.c
new file mode 100644 (file)
index 0000000..985d541
--- /dev/null
+++ b/fish/prep_lv.c
@@ -0,0 +1,113 @@
+/* guestfish - the filesystem interactive shell
+ * Copyright (C) 2010 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "fish.h"
+#include "prepopts.h"
+
+/* Split "/dev/VG/LV" into "VG" and "LV".  This function should
+ * probably do more checks.
+ */
+static int
+vg_lv_parse (const char *device, char **vg, char **lv)
+{
+  if (STRPREFIX (device, "/dev/"))
+    device += 5;
+
+  const char *p = strchr (device, '/');
+  if (p == NULL)
+    return -1;
+
+  if (vg) {
+    *vg = strndup (device, p - device);
+    if (*vg == NULL) {
+      perror ("strndup");
+      exit (EXIT_FAILURE);
+    }
+  }
+
+  if (lv) {
+    *lv = strdup (p+1);
+    if (*lv == NULL) {
+      perror ("strndup");
+      exit (EXIT_FAILURE);
+    }
+  }
+
+  return 0;
+}
+
+void
+prep_prelaunch_lv (const char *filename, prep_data *data)
+{
+  if (vg_lv_parse (data->params[0], NULL, NULL) == -1)
+    prep_error (data, filename, _("incorrect format for LV name, use '/dev/VG/LV'"));
+
+  if (alloc_disk (filename, data->params[1], 0, 1) == -1)
+    prep_error (data, filename, _("failed to allocate disk"));
+}
+
+void
+prep_postlaunch_lv (const char *filename, prep_data *data, const char *device)
+{
+  if (guestfs_part_disk (g, device, data->params[2]) == -1)
+    prep_error (data, filename, _("failed to partition disk: %s"),
+                guestfs_last_error (g));
+
+  char *vg;
+  char *lv;
+  if (vg_lv_parse (data->params[0], &vg, &lv) == -1)
+    prep_error (data, filename, _("incorrect format for LV name, use '/dev/VG/LV'"));
+
+  char *part;
+  if (asprintf (&part, "%s1", device) == -1) {
+    perror ("asprintf");
+    exit (EXIT_FAILURE);
+  }
+
+  if (guestfs_pvcreate (g, part) == -1)
+    prep_error (data, filename, _("failed to create PV: %s: %s"),
+                part, guestfs_last_error (g));
+
+  char *parts[] = { part, NULL };
+  if (guestfs_vgcreate (g, vg, parts) == -1)
+    prep_error (data, filename, _("failed to create VG: %s: %s"),
+                vg, guestfs_last_error (g));
+
+  /* Create the smallest possible LV, then resize it to fill
+   * all available space.
+   */
+  if (guestfs_lvcreate (g, lv, vg, 1) == -1)
+    prep_error (data, filename, _("failed to create LV: /dev/%s/%s: %s"),
+                vg, lv, guestfs_last_error (g));
+  if (guestfs_lvresize_free (g, data->params[0], 100) == -1)
+    prep_error (data, filename,
+                _("failed to resize LV to full size: %s: %s"),
+                data->params[0], guestfs_last_error (g));
+
+  free (part);
+  free (vg);
+  free (lv);
+}

diff --git a/po/POTFILES.in b/po/POTFILES.in
index d65ccfd..9e0e49c 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -83,6 +83,7 @@ fish/more.c
 fish/prep.c
 fish/prep_disk.c
 fish/prep_fs.c
+fish/prep_lv.c
 fish/prep_part.c
 fish/prepopts.c
 fish/progress.c

diff --git a/src/generator.ml b/src/generator.ml
index 2f2e391..363e78f 100755 (executable)
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -5651,6 +5651,18 @@ let prepopts = [
   DOS-style) partition table and an ext2 filesystem.
 
   These defaults can be changed by supplying optional parameters.");
+
+  ("lv",
+   "create a disk with logical volume",
+   [ "name", "/dev/VG/LV", "the name of the VG and LV to use";
+     "size", "100M", "the size of the disk image";
+     "partition", "mbr", "partition table type" ],
+   "  Create a disk with a single partition, set up the partition as an
+  LVM2 physical volume, and place a volume group and logical volume
+  on there.  This defaults to creating a 100MB disk with the VG and
+  LV called /dev/VG/LV.  You can change the name of the VG and LV
+  by supplying an alternate name as the first optional parameter.");
+
 ]
 
 (* Used to memoize the result of pod2text. *)