X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fext2.c;h=725352e3ff0ed32eea07de43d2fcdeb4ede8819a;hp=c5e14155ff9bbe448572563cead546e33fc8f52c;hb=4d900cdac8258daa2e99c6ceb2a4985154e94150;hpb=56bef498f46ac3dd580f4bde3c8f3ed2fe688826 diff --git a/daemon/ext2.c b/daemon/ext2.c index c5e1415..725352e 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 @@ -20,15 +20,46 @@ #include #include +#include +#include #include -#include -#include "../src/guestfs_protocol.h" +#include "guestfs_protocol.h" #include "daemon.h" +#include "c-ctype.h" #include "actions.h" +/* Confirmed this is true up to ext4 from the Linux sources. */ +#define EXT2_LABEL_MAX 16 + +/* 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 (char *device) +do_tune2fs_l (const char *device) { int r; char *out, *err; @@ -36,11 +67,13 @@ do_tune2fs_l (char *device) char **ret = NULL; int size = 0, alloc = 0; - IS_DEVICE (device, NULL); + 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: %s", err); + reply_with_error ("%s", err); free (err); free (out); return NULL; @@ -50,11 +83,11 @@ do_tune2fs_l (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; } @@ -74,34 +107,34 @@ do_tune2fs_l (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; + free (out); + return NULL; } - if (strcmp (colon, "") == 0 || - strcmp (colon, "") == 0 || - strcmp (colon, "(none)") == 0) { - if (add_string (&ret, &size, &alloc, "") == -1) { - free (out); - return NULL; - } + if (STREQ (colon, "") || + STREQ (colon, "") || + STREQ (colon, "(none)")) { + 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; } } @@ -117,16 +150,24 @@ do_tune2fs_l (char *device) } int -do_set_e2label (char *device, char *label) +do_set_e2label (const char *device, const char *label) { int r; char *err; - IS_DEVICE (device, -1); + char prog[] = "e2label"; + if (e2prog (prog) == -1) + return -1; + + if (strlen (label) > EXT2_LABEL_MAX) { + reply_with_error ("%s: ext2 labels are limited to %d bytes", + label, EXT2_LABEL_MAX); + return -1; + } - r = command (NULL, &err, "/sbin/e2label", device, label, NULL); + 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; } @@ -136,42 +177,86 @@ do_set_e2label (char *device, char *label) } char * -do_get_e2label (char *device) +do_get_e2label (const char *device) { - int r, len; - char *out, *err; + return do_vfs_label (device); +} - IS_DEVICE (device, NULL); +int +do_set_e2uuid (const char *device, const char *uuid) +{ + int r; + char *err; - r = command (&out, &err, "/sbin/e2label", 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 ("e2label: %s", err); - free (out); + reply_with_error ("%s", err); free (err); - return NULL; + return -1; } free (err); + return 0; +} - /* Remove any trailing \n from the label. */ - len = strlen (out); - if (len > 0 && out[len-1] == '\n') - out[len-1] = '\0'; - - return out; /* caller frees */ +char * +do_get_e2uuid (const char *device) +{ + return do_vfs_uuid (device); } int -do_set_e2uuid (char *device, char *uuid) +do_resize2fs (const char *device) { + char *err; int r; + + char prog[] = "resize2fs"; + if (e2prog (prog) == -1) + return -1; + + r = command (NULL, &err, prog, device, NULL); + if (r == -1) { + reply_with_error ("%s", err); + free (err); + return -1; + } + + free (err); + return 0; +} + +int +do_resize2fs_size (const char *device, int64_t size) +{ char *err; + int r; + + 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; - IS_DEVICE (device, -1); + char buf[32]; + snprintf (buf, sizeof buf, "%" PRIi64 "K", size); - r = command (NULL, &err, "/sbin/tune2fs", "-U", uuid, device, NULL); + r = command (NULL, &err, prog, device, buf, NULL); if (r == -1) { - reply_with_error ("tune2fs -U: %s", err); + reply_with_error ("%s", err); free (err); return -1; } @@ -180,80 +265,180 @@ do_set_e2uuid (char *device, char *uuid) return 0; } -char * -do_get_e2uuid (char *device) +int +do_e2fsck_f (const char *device) { + char *err; int r; - char *out, *err, *p, *q; - IS_DEVICE (device, NULL); + char prog[] = "e2fsck"; + if (e2prog (prog) == -1) + return -1; - /* It's not so straightforward to get the volume UUID. We have - * to use tune2fs -l and then look for a particular string in - * the output. + /* 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; + } + + free (err); + return 0; +} + +int +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 (&out, &err, "/sbin/tune2fs", "-l", device, NULL); + r = command (NULL, &err, + prog, "-O", "journal_dev", "-b", blocksize_s, + device, NULL); if (r == -1) { - reply_with_error ("tune2fs -l: %s", err); - free (out); + reply_with_error ("%s", err); free (err); - return NULL; + return -1; } free (err); + return 0; +} - /* Look for /\nFilesystem UUID:\s+/ in the output. */ - p = strstr (out, "\nFilesystem UUID:"); - if (p == NULL) { - reply_with_error ("no Filesystem UUID in the output of tune2fs -l"); - free (out); - return NULL; +int +do_mke2journal_L (int blocksize, const char *label, const char *device) +{ + char *err; + int r; + + char prog[] = "mke2fs"; + if (e2prog (prog) == -1) + return -1; + + if (strlen (label) > EXT2_LABEL_MAX) { + reply_with_error ("%s: ext2 labels are limited to %d bytes", + label, EXT2_LABEL_MAX); + return -1; } - p += 17; - while (*p && isspace (*p)) - p++; - if (!*p) { - reply_with_error ("malformed Filesystem UUID in the output of tune2fs -l"); - free (out); - return NULL; + char blocksize_s[32]; + snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize); + + r = command (NULL, &err, + prog, "-O", "journal_dev", "-b", blocksize_s, + "-L", label, + device, NULL); + if (r == -1) { + reply_with_error ("%s", err); + free (err); + return -1; } - /* Now 'p' hopefully points to the start of the UUID. */ - q = p; - while (*q && (isxdigit (*q) || *q == '-')) - q++; - if (!*q) { - reply_with_error ("malformed Filesystem UUID in the output of tune2fs -l"); - free (out); - return NULL; + free (err); + return 0; +} + +int +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, + prog, "-O", "journal_dev", "-b", blocksize_s, + "-U", uuid, + device, NULL); + if (r == -1) { + reply_with_error ("%s", err); + free (err); + return -1; } - *q = '\0'; + free (err); + return 0; +} - p = strdup (p); - if (!p) { - reply_with_perror ("strdup"); - free (out); - return NULL; +int +do_mke2fs_J (const char *fstype, int blocksize, const char *device, + const char *journal) +{ + 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); + + 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 ("%s", err); + free (err); + return -1; } - free (out); - return p; /* caller frees */ + free (err); + return 0; } int -do_resize2fs (char *device) +do_mke2fs_JL (const char *fstype, int blocksize, const char *device, + const char *label) { char *err; int r; - IS_DEVICE (device, -1); + char prog[] = "mke2fs"; + if (e2prog (prog) == -1) + return -1; - r = command (NULL, &err, "/sbin/resize2fs", device, NULL); + if (strlen (label) > EXT2_LABEL_MAX) { + reply_with_error ("%s: ext2 labels are limited to %d bytes", + label, EXT2_LABEL_MAX); + 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 ("resize2fs: %s", err); + reply_with_error ("%s", err); free (err); return -1; } @@ -263,16 +448,28 @@ do_resize2fs (char *device) } int -do_e2fsck_f (char *device) +do_mke2fs_JU (const char *fstype, int blocksize, const char *device, + const char *uuid) { char *err; int r; - IS_DEVICE (device, -1); + char prog[] = "mke2fs"; + if (e2prog (prog) == -1) + 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, "/sbin/e2fsck", "-p", "-f", device, NULL); + r = command (NULL, &err, + prog, "-t", fstype, "-J", jdev, "-b", blocksize_s, + device, NULL); if (r == -1) { - reply_with_error ("e2fsck: %s", err); + reply_with_error ("%s", err); free (err); return -1; }