X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fext2.c;h=a26891b03dc7bf034b2cd3d244c4baec371982e1;hp=99c12f091088fa8aa59efe85e588064b9738a950;hb=2b891ceef355ce2d6532d65f8febbe3833d4399e;hpb=668d27b56857230fb81c04d1663a5aca1b9e77b9

diff --git a/daemon/ext2.c b/daemon/ext2.c
index 99c12f0..a26891b 100644
--- a/daemon/ext2.c
+++ b/daemon/ext2.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
@@ -36,8 +36,6 @@ do_tune2fs_l (const char *device)
   char **ret = NULL;
   int size = 0, alloc = 0;
 
-  IS_DEVICE (device, NULL);
-
   r = command (&out, &err, "/sbin/tune2fs", "-l", device, NULL);
   if (r == -1) {
     reply_with_error ("tune2fs: %s", err);
@@ -77,31 +75,31 @@ do_tune2fs_l (const char *device)
       do { colon++; } while (*colon && isspace (*colon));
 
       if (add_string (&ret, &size, &alloc, p) == -1) {
-	free (out);
-	return NULL;
+        free (out);
+        return NULL;
       }
       if (strcmp (colon, "<none>") == 0 ||
-	  strcmp (colon, "<not available>") == 0 ||
-	  strcmp (colon, "(none)") == 0) {
-	if (add_string (&ret, &size, &alloc, "") == -1) {
-	  free (out);
-	  return NULL;
-	}
+          strcmp (colon, "<not available>") == 0 ||
+          strcmp (colon, "(none)") == 0) {
+        if (add_string (&ret, &size, &alloc, "") == -1) {
+          free (out);
+          return NULL;
+        }
       } else {
-	if (add_string (&ret, &size, &alloc, colon) == -1) {
-	  free (out);
-	  return NULL;
-	}
+        if (add_string (&ret, &size, &alloc, colon) == -1) {
+          free (out);
+          return NULL;
+        }
       }
     }
     else {
       if (add_string (&ret, &size, &alloc, p) == -1) {
-	free (out);
-	return NULL;
+        free (out);
+        return NULL;
       }
       if (add_string (&ret, &size, &alloc, "") == -1) {
-	free (out);
-	return NULL;
+        free (out);
+        return NULL;
       }
     }
 
@@ -234,3 +232,229 @@ do_get_e2uuid (const char *device)
   free (out);
   return p;			/* caller frees */
 }
+
+int
+do_resize2fs (const char *device)
+{
+  char *err;
+  int r;
+
+  r = command (NULL, &err, "/sbin/resize2fs", device, NULL);
+  if (r == -1) {
+    reply_with_error ("resize2fs: %s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+  return 0;
+}
+
+int
+do_e2fsck_f (const char *device)
+{
+  char *err;
+  int r;
+
+  r = command (NULL, &err, "/sbin/e2fsck", "-p", "-f", device, NULL);
+  if (r == -1) {
+    reply_with_error ("e2fsck: %s", err);
+    free (err);
+    return -1;
+  }
+
+  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;
+}
+
+/* Run mke2fs to create a filesystem of type fstype, where fstype
+ * is the string "ext2", "ext3" or "ext4".
+ *
+ * This is more complex than it seems.
+ *
+ * On RHEL 5, the -t option was deprecated.  Moreover RHEL <= 5.4
+ * systems have a bug where the -t option doesn't work (it doesn't
+ * correctly ignore the following argument).
+ *
+ * On RHEL 5, to create an ext4dev filesystem you have to use
+ * the special command /sbin/mke4fs.  This can also create ext2/3
+ * using the '-t fstype' option.
+ *
+ * On Fedora 11+, mke4fs was renamed mke2fs, and it can use the
+ * '-t fstype' option to specify the filesystem type.
+ *
+ * So it seems best to run /sbin/mke4fs if it exists, or /sbin/mke2fs
+ * otherwise.  We specify e4fsprogs in the package list to ensure it
+ * is loaded if it exists.
+ */
+static const char *
+get_mke2fs (void)
+{
+  static const char *const progs[] = { "/sbin/mke4fs", "/sbin/mke2fs", NULL };
+  int i;
+
+  for (i = 0; progs[i]; ++i)
+    if (access (progs[i], F_OK) == 0)
+      return progs[i];
+
+  reply_with_error ("mke2fs: no mke2fs binary found in appliance");
+  return NULL;
+}
+
+int
+do_mke2fs_J (const char *fstype, int blocksize, const char *device,
+             const char *journal)
+{
+  char *err;
+  int r;
+
+  const char *prog = get_mke2fs ();
+  if (!prog) return -1;
+
+  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,
+               prog, "-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;
+
+  const char *prog = get_mke2fs ();
+  if (!prog) return -1;
+
+  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,
+               prog, "-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;
+
+  const char *prog = get_mke2fs ();
+  if (!prog) return -1;
+
+  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,
+               prog, "-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;
+}