fish: Add guestfish -N lvfs for creating formatted LVs.

diff --git a/fish/prep_lv.c b/fish/prep_lv.c
index 985d541..1e726db 100644 (file)
--- a/fish/prep_lv.c
+++ b/fish/prep_lv.c
@@ -111,3 +111,61 @@ prep_postlaunch_lv (const char *filename, prep_data *data, const char *device)
   free (vg);
   free (lv);
 }
+
+void
+prep_prelaunch_lvfs (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[2], 0, 1) == -1)
+    prep_error (data, filename, _("failed to allocate disk"));
+}
+
+void
+prep_postlaunch_lvfs (const char *filename, prep_data *data, const char *device)
+{
+  if (guestfs_part_disk (g, device, data->params[3]) == -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));
+
+  /* Create the filesystem. */
+  if (guestfs_mkfs (g, data->params[1], data->params[0]) == -1)
+    prep_error (data, filename, _("failed to create filesystem (%s): %s"),
+                data->params[1], guestfs_last_error (g));
+
+  free (part);
+  free (vg);
+  free (lv);
+}

diff --git a/src/generator.ml b/src/generator.ml
index 363e78f..5c2ffeb 100755 (executable)
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -5661,7 +5661,21 @@ let prepopts = [
   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.");
+  by supplying an alternate name as the first optional parameter.
+
+  Note this does not create a filesystem.  Use 'lvfs' to do that.");
+
+  ("lvfs",
+   "create a disk with logical volume and filesystem",
+   [ "name", "/dev/VG/LV", "the name of the VG and LV to use";
+     "filesystem", "ext2", "the type of filesystem 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.  Then format the LV with a filesystem.  This defaults to
+  creating a 100MB disk with the VG and LV called /dev/VG/LV, with an
+  ext2 filesystem.");
 
 ]