X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fext2.c;h=3a075e565dbd42cd0f853a47d158359a4329a880;hp=a26891b03dc7bf034b2cd3d244c4baec371982e1;hb=f323479760ab23755d6b4f27c236befb5a4d6111;hpb=2b891ceef355ce2d6532d65f8febbe3833d4399e diff --git a/daemon/ext2.c b/daemon/ext2.c index a26891b..3a075e5 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -20,13 +20,41 @@ #include #include +#include +#include #include -#include #include "../src/guestfs_protocol.h" #include "daemon.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) { @@ -36,9 +64,13 @@ 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; @@ -48,11 +80,11 @@ do_tune2fs_l (const char *device) p = out; /* Discard the first line if it contains "tune2fs ...". */ - if (strncmp (p, "tune2fs ", 8) == 0) { + 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; } @@ -72,15 +104,15 @@ do_tune2fs_l (const char *device) 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, "") == 0 || - strcmp (colon, "") == 0 || - strcmp (colon, "(none)") == 0) { + if (STREQ (colon, "") || + STREQ (colon, "") || + STREQ (colon, "(none)")) { if (add_string (&ret, &size, &alloc, "") == -1) { free (out); return NULL; @@ -120,9 +152,13 @@ do_set_e2label (const char *device, const char *label) 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; } @@ -137,9 +173,13 @@ do_get_e2label (const char *device) 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; @@ -161,9 +201,13 @@ do_set_e2uuid (const char *device, const char *uuid) 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; } @@ -182,10 +226,13 @@ do_get_e2uuid (const char *device) * 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; @@ -202,7 +249,7 @@ do_get_e2uuid (const char *device) } 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"); @@ -212,7 +259,7 @@ do_get_e2uuid (const char *device) /* 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"); @@ -239,9 +286,13 @@ do_resize2fs (const char *device) 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; } @@ -251,14 +302,60 @@ do_resize2fs (const char *device) } int -do_e2fsck_f (const char *device) +do_resize2fs_size (const char *device, int64_t size) { char *err; int r; - r = command (NULL, &err, "/sbin/e2fsck", "-p", "-f", device, NULL); + char prog[] = "resize2fs"; + if (e2prog (prog) == -1) + return -1; + + /* resize2fs itself may impose additional limits. Since we are + * going to use the 'K' suffix however we can only work with whole + * kilobytes. + */ + if (size & 1023) { + reply_with_error ("%" PRIi64 ": size must be a round number of kilobytes", + size); + return -1; + } + size /= 1024; + + char buf[32]; + snprintf (buf, sizeof buf, "%" PRIi64 "K", size); + + r = command (NULL, &err, prog, device, buf, NULL); if (r == -1) { - reply_with_error ("e2fsck: %s", err); + reply_with_error ("%s", err); + free (err); + return -1; + } + + free (err); + return 0; +} + +int +do_e2fsck_f (const char *device) +{ + char *err; + int r; + + 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; } @@ -273,14 +370,18 @@ do_mke2journal (int blocksize, const char *device) 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; } @@ -295,15 +396,19 @@ do_mke2journal_L (int blocksize, const char *label, const char *device) 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; } @@ -318,15 +423,19 @@ do_mke2journal_U (int blocksize, const char *uuid, const char *device) 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; } @@ -335,40 +444,6 @@ 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) @@ -376,8 +451,9 @@ do_mke2fs_J (const char *fstype, int blocksize, const char *device, 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); @@ -390,7 +466,7 @@ do_mke2fs_J (const char *fstype, int blocksize, const char *device, 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; } @@ -406,8 +482,9 @@ do_mke2fs_JL (const char *fstype, int blocksize, const char *device, 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); @@ -420,7 +497,7 @@ do_mke2fs_JL (const char *fstype, int blocksize, const char *device, 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; } @@ -436,8 +513,9 @@ do_mke2fs_JU (const char *fstype, int blocksize, const char *device, 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); @@ -450,7 +528,7 @@ do_mke2fs_JU (const char *fstype, int blocksize, const char *device, 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; }