New commands: mkfs-b, mke2journal*, mke2fs-J*

mkfs-b: Pass the -b (blocksize) parameter to mkfs.

mke2journal and friends: Lets you create external ext2 journals on
devices.

mke2fs-J and friends: Lets you create ext2/3/4 filesystems with
external journals.

4 files changed, 218 insertions, 17 deletions

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 94069440..e6af0feb 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -52,6 +52,7 @@ guestfsd_SOURCES = \
 	link.c \
 	ls.c \
 	lvm.c \
+	mkfs.c \
 	mknod.c \
 	mount.c \
 	names.c \
diff --git a/daemon/devsparts.c b/daemon/devsparts.c
index b4ea5788..76852cca 100644
--- a/daemon/devsparts.c
+++ b/daemon/devsparts.c
@@ -186,20 +186,3 @@ do_list_partitions (void)
 {
   return foreach_block_device(add_partitions);
 }
-
-int
-do_mkfs (const char *fstype, const char *device)
-{
-  char *err;
-  int r;
-
-  r = command (NULL, &err, "/sbin/mkfs", "-t", fstype, device, NULL);
-  if (r == -1) {
-    reply_with_error ("mkfs: %s", err);
-    free (err);
-    return -1;
-  }
-
-  free (err);
-  return 0;
-}
diff --git a/daemon/ext2.c b/daemon/ext2.c
index f181b8d7..2603ed06 100644
--- a/daemon/ext2.c
+++ b/daemon/ext2.c
@@ -266,3 +266,152 @@ do_e2fsck_f (const char *device)
   free (err);
   return 0;
 }
+
+int
+do_mke2journal (int blocksize, const char *device)
+{
+  char *err;
+  int r;
+
+  char blocksize_s[32];
+  snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
+
+  r = command (NULL, &err,
+	       "/sbin/mke2fs", "-O", "journal_dev", "-b", blocksize_s,
+	       device, NULL);
+  if (r == -1) {
+    reply_with_error ("mke2journal: %s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+  return 0;
+}
+
+int
+do_mke2journal_L (int blocksize, const char *label, const char *device)
+{
+  char *err;
+  int r;
+
+  char blocksize_s[32];
+  snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
+
+  r = command (NULL, &err,
+	       "/sbin/mke2fs", "-O", "journal_dev", "-b", blocksize_s,
+	       "-L", label,
+	       device, NULL);
+  if (r == -1) {
+    reply_with_error ("mke2journal_L: %s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+  return 0;
+}
+
+int
+do_mke2journal_U (int blocksize, const char *uuid, const char *device)
+{
+  char *err;
+  int r;
+
+  char blocksize_s[32];
+  snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
+
+  r = command (NULL, &err,
+	       "/sbin/mke2fs", "-O", "journal_dev", "-b", blocksize_s,
+	       "-U", uuid,
+	       device, NULL);
+  if (r == -1) {
+    reply_with_error ("mke2journal_U: %s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+  return 0;
+}
+
+int
+do_mke2fs_J (const char *fstype, int blocksize, const char *device,
+	     const char *journal)
+{
+  char *err;
+  int r;
+
+  char blocksize_s[32];
+  snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
+
+  int len = strlen (journal);
+  char jdev[len+32];
+  snprintf (jdev, len+32, "device=%s", journal);
+
+  r = command (NULL, &err,
+	       "/sbin/mke2fs", "-t", fstype, "-J", jdev, "-b", blocksize_s,
+	       device, NULL);
+  if (r == -1) {
+    reply_with_error ("mke2fs_J: %s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+  return 0;
+}
+
+int
+do_mke2fs_JL (const char *fstype, int blocksize, const char *device,
+	      const char *label)
+{
+  char *err;
+  int r;
+
+  char blocksize_s[32];
+  snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
+
+  int len = strlen (label);
+  char jdev[len+32];
+  snprintf (jdev, len+32, "device=LABEL=%s", label);
+
+  r = command (NULL, &err,
+	       "/sbin/mke2fs", "-t", fstype, "-J", jdev, "-b", blocksize_s,
+	       device, NULL);
+  if (r == -1) {
+    reply_with_error ("mke2fs_JL: %s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+  return 0;
+}
+
+int
+do_mke2fs_JU (const char *fstype, int blocksize, const char *device,
+	      const char *uuid)
+{
+  char *err;
+  int r;
+
+  char blocksize_s[32];
+  snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
+
+  int len = strlen (uuid);
+  char jdev[len+32];
+  snprintf (jdev, len+32, "device=UUID=%s", uuid);
+
+  r = command (NULL, &err,
+	       "/sbin/mke2fs", "-t", fstype, "-J", jdev, "-b", blocksize_s,
+	       device, NULL);
+  if (r == -1) {
+    reply_with_error ("mke2fs_JU: %s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+  return 0;
+}
diff --git a/daemon/mkfs.c b/daemon/mkfs.c
new file mode 100644
index 00000000..73fd860e
--- /dev/null
+++ b/daemon/mkfs.c
@@ -0,0 +1,68 @@
+/* libguestfs - the guestfsd daemon
+ * 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
+ * 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 <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <sys/stat.h>
+
+#include "daemon.h"
+#include "actions.h"
+
+int
+do_mkfs (const char *fstype, const char *device)
+{
+  char *err;
+  int r;
+
+  r = command (NULL, &err, "/sbin/mkfs", "-t", fstype, device, NULL);
+  if (r == -1) {
+    reply_with_error ("mkfs: %s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+  return 0;
+}
+
+int
+do_mkfs_b (const char *fstype, int blocksize, const char *device)
+{
+  char *err;
+  int r;
+
+  char blocksize_s[32];
+  snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
+
+  r = command (NULL, &err,
+	       "/sbin/mkfs", "-t", fstype, "-b", blocksize_s, device, NULL);
+  if (r == -1) {
+    reply_with_error ("mkfs_b: %s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+  return 0;
+}