#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
-#include <ctype.h>
#include "../src/guestfs_protocol.h"
#include "daemon.h"
+#include "c-ctype.h"
#include "actions.h"
char **
r = command (&out, &err, "/sbin/tune2fs", "-l", device, NULL);
if (r == -1) {
- reply_with_error ("tune2fs: %s", err);
+ reply_with_error ("%s", err);
free (err);
free (out);
return NULL;
p = out;
/* Discard the first line if it contains "tune2fs ...". */
- if (strncmp (p, "tune2fs ", 8) == 0) {
+ if (STREQLEN (p, "tune2fs ", 8)) {
p = strchr (p, '\n');
if (p) p++;
else {
- reply_with_error ("tune2fs: truncated output");
+ reply_with_error ("truncated output");
free (out);
return NULL;
}
if (colon) {
*colon = '\0';
- do { colon++; } while (*colon && isspace (*colon));
+ do { colon++; } while (*colon && c_isspace (*colon));
if (add_string (&ret, &size, &alloc, p) == -1) {
free (out);
return NULL;
}
- if (strcmp (colon, "<none>") == 0 ||
- strcmp (colon, "<not available>") == 0 ||
- strcmp (colon, "(none)") == 0) {
+ if (STREQ (colon, "<none>") ||
+ STREQ (colon, "<not available>") ||
+ STREQ (colon, "(none)")) {
if (add_string (&ret, &size, &alloc, "") == -1) {
free (out);
return NULL;
r = command (NULL, &err, "/sbin/e2label", device, label, NULL);
if (r == -1) {
- reply_with_error ("e2label: %s", err);
+ reply_with_error ("%s", err);
free (err);
return -1;
}
r = command (&out, &err, "/sbin/e2label", device, NULL);
if (r == -1) {
- reply_with_error ("e2label: %s", err);
+ reply_with_error ("%s", err);
free (out);
free (err);
return NULL;
r = command (NULL, &err, "/sbin/tune2fs", "-U", uuid, device, NULL);
if (r == -1) {
- reply_with_error ("tune2fs -U: %s", err);
+ reply_with_error ("%s", err);
free (err);
return -1;
}
r = command (&out, &err, "/sbin/tune2fs", "-l", device, NULL);
if (r == -1) {
- reply_with_error ("tune2fs -l: %s", err);
+ reply_with_error ("%s", err);
free (out);
free (err);
return NULL;
}
p += 17;
- while (*p && isspace (*p))
+ while (*p && c_isspace (*p))
p++;
if (!*p) {
reply_with_error ("malformed Filesystem UUID in the output of tune2fs -l");
/* Now 'p' hopefully points to the start of the UUID. */
q = p;
- while (*q && (isxdigit (*q) || *q == '-'))
+ while (*q && (c_isxdigit (*q) || *q == '-'))
q++;
if (!*q) {
reply_with_error ("malformed Filesystem UUID in the output of tune2fs -l");
r = command (NULL, &err, "/sbin/resize2fs", device, NULL);
if (r == -1) {
- reply_with_error ("resize2fs: %s", err);
+ reply_with_error ("%s", err);
free (err);
return -1;
}
r = command (NULL, &err, "/sbin/e2fsck", "-p", "-f", device, NULL);
if (r == -1) {
- reply_with_error ("e2fsck: %s", err);
+ reply_with_error ("%s", err);
free (err);
return -1;
}
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);
+ reply_with_error ("%s", err);
free (err);
return -1;
}
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);
+ reply_with_error ("%s", err);
free (err);
return -1;
}
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);
+ reply_with_error ("%s", err);
free (err);
return -1;
}
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 ("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);
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);
+ reply_with_error ("%s", err);
free (err);
return -1;
}
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);
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);
+ reply_with_error ("%s", err);
free (err);
return -1;
}
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);
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);
+ reply_with_error ("%s", err);
free (err);
return -1;
}