diff options
| -rw-r--r-- | appliance/packagelist.in | 19 | ||||
| -rw-r--r-- | daemon/mkfs.c | 79 |
2 files changed, 81 insertions, 17 deletions
diff --git a/appliance/packagelist.in b/appliance/packagelist.in index b3609df2..4ef58658 100644 --- a/appliance/packagelist.in +++ b/appliance/packagelist.in @@ -10,21 +10,33 @@ #if REDHAT == 1 augeas-libs + btrfs-progs diffutils /* e4fsprogs only exists on RHEL 5, will be ignored everywhere else. */ e4fsprogs + gfs-utils + gfs2-utils + hfsplus-tools iputils kernel MAKEDEV + nilfs-utils ntfsprogs + reiserfs-utils scrub libselinux udev util-linux-ng #elif DEBIAN == 1 bsdmainutils + btrfs-tools + gfs-tools + gfs2-tools + hfsplus iproute libaugeas0 + nilfs2-tools + reiserfsprogs udev util-linux #endif @@ -35,11 +47,18 @@ coreutils dosfstools file grub +jfsutils lsof lvm2 module-init-tools net-tools ntfs-3g +/* +Enabling this pulls out 140 extra packages +into the appliance: +ocfs2-tools +*/ +parted procps strace xfsprogs diff --git a/daemon/mkfs.c b/daemon/mkfs.c index faeeaeb6..506066f3 100644 --- a/daemon/mkfs.c +++ b/daemon/mkfs.c @@ -29,15 +29,61 @@ #include "daemon.h" #include "actions.h" -int -do_mkfs (const char *fstype, const char *device) +#define MAX_ARGS 16 + +static int +mkfs (const char *fstype, const char *device, + const char **extra, size_t nr_extra) { - char *err; + const char *argv[MAX_ARGS]; + size_t i = 0, j; int r; + char *err; + + argv[i++] = "/sbin/mkfs"; + argv[i++] = "-t"; + argv[i++] = fstype; + + /* mkfs.ntfs requires the -Q argument otherwise it writes zeroes + * to every block and does bad block detection, neither of which + * are useful behaviour for virtual devices. + */ + if (strcmp (fstype, "ntfs") == 0) + argv[i++] = "-Q"; + + /* mkfs.reiserfs produces annoying interactive prompts unless you + * tell it to be quiet. + */ + if (strcmp (fstype, "reiserfs") == 0) + argv[i++] = "-f"; - r = command (NULL, &err, "/sbin/mkfs", "-t", fstype, device, NULL); + /* Same for JFS. */ + if (strcmp (fstype, "jfs") == 0) + argv[i++] = "-f"; + + /* For GFS, GFS2, assume a single node. */ + if (strcmp (fstype, "gfs") == 0 || strcmp (fstype, "gfs2") == 0) { + argv[i++] = "-p"; + argv[i++] = "lock_nolock"; + /* The man page says this is default, but it doesn't seem to be: */ + argv[i++] = "-j"; + argv[i++] = "1"; + /* Don't ask questions: */ + argv[i++] = "-O"; + } + + for (j = 0; j < nr_extra; ++j) + argv[i++] = extra[j]; + + argv[i++] = device; + argv[i++] = NULL; + + if (i > MAX_ARGS) + abort (); + + r = commandv (NULL, &err, argv); if (r == -1) { - reply_with_error ("mkfs: %s", err); + reply_with_error ("mkfs: %s: %s: %s", fstype, device, err); free (err); return -1; } @@ -47,22 +93,21 @@ do_mkfs (const char *fstype, const char *device) } int -do_mkfs_b (const char *fstype, int blocksize, const char *device) +do_mkfs (const char *fstype, const char *device) { - char *err; - int r; + return mkfs (fstype, device, NULL, 0); +} +int +do_mkfs_b (const char *fstype, int blocksize, const char *device) +{ + const char *extra[2]; char blocksize_s[32]; + snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize); - r = command (NULL, &err, - "/sbin/mkfs", "-t", fstype, "-b", blocksize_s, device, NULL); - if (r == -1) { - reply_with_error ("mkfs_b: %s", err); - free (err); - return -1; - } + extra[0] = "-b"; + extra[1] = blocksize_s; - free (err); - return 0; + return mkfs (fstype, device, extra, 2); } |