#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#include "../src/guestfs_protocol.h"
#include "c-ctype.h"
#include "actions.h"
+/* Choose which tools like mke2fs to use. For RHEL 5 (only) there
+ * is a special set of tools which support ext2/3/4. eg. On RHEL 5,
+ * mke2fs only supports ext2/3, but mke4fs supports ext2/3/4.
+ *
+ * We specify e4fsprogs in the package list to ensure it is loaded
+ * if it exists.
+ */
+static int
+e2prog (char *name)
+{
+ char *p = strstr (name, "e2");
+ if (!p) return 0;
+ p++;
+
+ *p = '4';
+ if (prog_exists (name))
+ return 0;
+
+ *p = '2';
+ if (prog_exists (name))
+ return 0;
+
+ reply_with_error ("cannot find required program %s", name);
+ return -1;
+}
+
char **
do_tune2fs_l (const char *device)
{
char **ret = NULL;
int size = 0, alloc = 0;
- r = command (&out, &err, "/sbin/tune2fs", "-l", device, NULL);
+ char prog[] = "tune2fs";
+ if (e2prog (prog) == -1)
+ return NULL;
+
+ r = command (&out, &err, prog, "-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 (STREQLEN (p, "tune2fs ", 8)) {
+ if (STRPREFIX (p, "tune2fs ") || STRPREFIX (p, "tune4fs ")) {
p = strchr (p, '\n');
if (p) p++;
else {
- reply_with_error ("tune2fs: truncated output");
+ reply_with_error ("truncated output");
free (out);
return NULL;
}
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;
int r;
char *err;
- r = command (NULL, &err, "/sbin/e2label", device, label, NULL);
+ char prog[] = "e2label";
+ if (e2prog (prog) == -1)
+ return -1;
+
+ r = command (NULL, &err, prog, device, label, NULL);
if (r == -1) {
- reply_with_error ("e2label: %s", err);
+ reply_with_error ("%s", err);
free (err);
return -1;
}
int r, len;
char *out, *err;
- r = command (&out, &err, "/sbin/e2label", device, NULL);
+ char prog[] = "e2label";
+ if (e2prog (prog) == -1)
+ return NULL;
+
+ r = command (&out, &err, prog, device, NULL);
if (r == -1) {
- reply_with_error ("e2label: %s", err);
+ reply_with_error ("%s", err);
free (out);
free (err);
return NULL;
int r;
char *err;
- r = command (NULL, &err, "/sbin/tune2fs", "-U", uuid, device, NULL);
+ char prog[] = "tune2fs";
+ if (e2prog (prog) == -1)
+ return -1;
+
+ r = command (NULL, &err, prog, "-U", uuid, device, NULL);
if (r == -1) {
- reply_with_error ("tune2fs -U: %s", err);
+ reply_with_error ("%s", err);
free (err);
return -1;
}
* to use tune2fs -l and then look for a particular string in
* the output.
*/
+ char prog[] = "tune2fs";
+ if (e2prog (prog) == -1)
+ return NULL;
- r = command (&out, &err, "/sbin/tune2fs", "-l", device, NULL);
+ r = command (&out, &err, prog, "-l", device, NULL);
if (r == -1) {
- reply_with_error ("tune2fs -l: %s", err);
+ reply_with_error ("%s", err);
free (out);
free (err);
return NULL;
char *err;
int r;
- r = command (NULL, &err, "/sbin/resize2fs", device, NULL);
+ char prog[] = "resize2fs";
+ if (e2prog (prog) == -1)
+ return -1;
+
+ r = command (NULL, &err, prog, device, NULL);
if (r == -1) {
- reply_with_error ("resize2fs: %s", err);
+ reply_with_error ("%s", err);
free (err);
return -1;
}
char *err;
int r;
- r = command (NULL, &err, "/sbin/e2fsck", "-p", "-f", device, NULL);
- if (r == -1) {
- reply_with_error ("e2fsck: %s", err);
+ char prog[] = "e2fsck";
+ if (e2prog (prog) == -1)
+ return -1;
+
+ /* 0 = no errors, 1 = errors corrected.
+ *
+ * >= 4 means uncorrected or other errors.
+ *
+ * 2, 3 means errors were corrected and we require a reboot. This is
+ * a difficult corner case.
+ */
+ r = commandr (NULL, &err, prog, "-p", "-f", device, NULL);
+ if (r == -1 || r >= 2) {
+ reply_with_error ("%s", err);
free (err);
return -1;
}
char *err;
int r;
+ char prog[] = "mke2fs";
+ if (e2prog (prog) == -1)
+ return -1;
+
char blocksize_s[32];
snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
r = command (NULL, &err,
- "/sbin/mke2fs", "-O", "journal_dev", "-b", blocksize_s,
+ prog, "-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;
}
char *err;
int r;
+ char prog[] = "mke2fs";
+ if (e2prog (prog) == -1)
+ return -1;
+
char blocksize_s[32];
snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
r = command (NULL, &err,
- "/sbin/mke2fs", "-O", "journal_dev", "-b", blocksize_s,
+ prog, "-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;
}
char *err;
int r;
+ char prog[] = "mke2fs";
+ if (e2prog (prog) == -1)
+ return -1;
+
char blocksize_s[32];
snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
r = command (NULL, &err,
- "/sbin/mke2fs", "-O", "journal_dev", "-b", blocksize_s,
+ prog, "-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 ("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 prog[] = "mke2fs";
+ if (e2prog (prog) == -1)
+ return -1;
char blocksize_s[32];
snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
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;
}
char *err;
int r;
- const char *prog = get_mke2fs ();
- if (!prog) return -1;
+ char prog[] = "mke2fs";
+ if (e2prog (prog) == -1)
+ return -1;
char blocksize_s[32];
snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
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;
}
char *err;
int r;
- const char *prog = get_mke2fs ();
- if (!prog) return -1;
+ char prog[] = "mke2fs";
+ if (e2prog (prog) == -1)
+ return -1;
char blocksize_s[32];
snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
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;
}
git.annexia.org / libguestfs.git / blobdiff