X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fext2.c;h=a26891b03dc7bf034b2cd3d244c4baec371982e1;hp=2603ed064d9f5debfbacef306dbc068eb60dc54b;hb=d15195bad9e50f4d80e84c39100a217a260fc806;hpb=a61bccecfba1c9501910d28de24bac945e95001f

diff --git a/daemon/ext2.c b/daemon/ext2.c
index 2603ed0..a26891b 100644
--- a/daemon/ext2.c
+++ b/daemon/ext2.c
@@ -277,8 +277,8 @@ do_mke2journal (int blocksize, const char *device)
   snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
 
   r = command (NULL, &err,
-	       "/sbin/mke2fs", "-O", "journal_dev", "-b", blocksize_s,
-	       device, NULL);
+               "/sbin/mke2fs", "-O", "journal_dev", "-b", blocksize_s,
+               device, NULL);
   if (r == -1) {
     reply_with_error ("mke2journal: %s", err);
     free (err);
@@ -299,9 +299,9 @@ do_mke2journal_L (int blocksize, const char *label, const char *device)
   snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
 
   r = command (NULL, &err,
-	       "/sbin/mke2fs", "-O", "journal_dev", "-b", blocksize_s,
-	       "-L", label,
-	       device, NULL);
+               "/sbin/mke2fs", "-O", "journal_dev", "-b", blocksize_s,
+               "-L", label,
+               device, NULL);
   if (r == -1) {
     reply_with_error ("mke2journal_L: %s", err);
     free (err);
@@ -322,9 +322,9 @@ do_mke2journal_U (int blocksize, const char *uuid, const char *device)
   snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
 
   r = command (NULL, &err,
-	       "/sbin/mke2fs", "-O", "journal_dev", "-b", blocksize_s,
-	       "-U", uuid,
-	       device, NULL);
+               "/sbin/mke2fs", "-O", "journal_dev", "-b", blocksize_s,
+               "-U", uuid,
+               device, NULL);
   if (r == -1) {
     reply_with_error ("mke2journal_U: %s", err);
     free (err);
@@ -335,13 +335,50 @@ do_mke2journal_U (int blocksize, const char *uuid, const char *device)
   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)
+             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);
 
@@ -350,8 +387,8 @@ do_mke2fs_J (const char *fstype, int blocksize, const char *device,
   snprintf (jdev, len+32, "device=%s", journal);
 
   r = command (NULL, &err,
-	       "/sbin/mke2fs", "-t", fstype, "-J", jdev, "-b", blocksize_s,
-	       device, NULL);
+               prog, "-t", fstype, "-J", jdev, "-b", blocksize_s,
+               device, NULL);
   if (r == -1) {
     reply_with_error ("mke2fs_J: %s", err);
     free (err);
@@ -364,11 +401,14 @@ do_mke2fs_J (const char *fstype, int blocksize, const char *device,
 
 int
 do_mke2fs_JL (const char *fstype, int blocksize, const char *device,
-	      const char *label)
+              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);
 
@@ -377,8 +417,8 @@ do_mke2fs_JL (const char *fstype, int blocksize, const char *device,
   snprintf (jdev, len+32, "device=LABEL=%s", label);
 
   r = command (NULL, &err,
-	       "/sbin/mke2fs", "-t", fstype, "-J", jdev, "-b", blocksize_s,
-	       device, NULL);
+               prog, "-t", fstype, "-J", jdev, "-b", blocksize_s,
+               device, NULL);
   if (r == -1) {
     reply_with_error ("mke2fs_JL: %s", err);
     free (err);
@@ -391,11 +431,14 @@ do_mke2fs_JL (const char *fstype, int blocksize, const char *device,
 
 int
 do_mke2fs_JU (const char *fstype, int blocksize, const char *device,
-	      const char *uuid)
+              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);
 
@@ -404,8 +447,8 @@ do_mke2fs_JU (const char *fstype, int blocksize, const char *device,
   snprintf (jdev, len+32, "device=UUID=%s", uuid);
 
   r = command (NULL, &err,
-	       "/sbin/mke2fs", "-t", fstype, "-J", jdev, "-b", blocksize_s,
-	       device, NULL);
+               prog, "-t", fstype, "-J", jdev, "-b", blocksize_s,
+               device, NULL);
   if (r == -1) {
     reply_with_error ("mke2fs_JU: %s", err);
     free (err);