From 24fb2c1255f751dad98dd1739b3ed3a52ce06f70 Mon Sep 17 00:00:00 2001 From: Nikita A Menkovich Date: Mon, 4 Jul 2011 10:25:04 +0100 Subject: [PATCH] Implement inode option to mkfs_opts command. This is needed because older versions of grub(for example in centos) do not understand filesystems created with newer version of e2fsprogs. By default in e2fsprogs 1.4+ creates partitions with 256 bit inode size, and grub expect 128 bit size. --- daemon/mkfs.c | 25 ++++++++++++++++++++++--- generator/generator_actions.ml | 9 +++++++-- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/daemon/mkfs.c b/daemon/mkfs.c index cd27268..64762fb 100644 --- a/daemon/mkfs.c +++ b/daemon/mkfs.c @@ -33,11 +33,13 @@ /* Takes optional arguments, consult optargs_bitmask. */ int -do_mkfs_opts (const char *fstype, const char *device, int blocksize, const char *features) +do_mkfs_opts (const char *fstype, const char *device, int blocksize, + const char *features, int inode) { const char *argv[MAX_ARGS]; size_t i = 0; char blocksize_str[32]; + char inode_str[32]; int r; char *err; @@ -140,6 +142,23 @@ do_mkfs_opts (const char *fstype, const char *device, int blocksize, const char argv[i++] = features; } + if (optargs_bitmask & GUESTFS_MKFS_OPTS_INODE_BITMASK) { + if (!STREQ (fstype, "ext2") && !STREQ (fstype, "ext3") && + !STREQ (fstype, "ext4")) { + reply_with_error ("inode size (-I) can only be set on ext2/3/4 filesystems"); + return -1; + } + + if (inode <= 0) { + reply_with_error ("inode size must be larger than zero"); + return -1; + } + + snprintf (inode_str, sizeof inode_str, "%d", inode); + argv[i++] = "-I"; + argv[i++] = inode_str; + } + argv[i++] = device; argv[i++] = NULL; @@ -161,12 +180,12 @@ int do_mkfs (const char *fstype, const char *device) { optargs_bitmask = 0; - return do_mkfs_opts (fstype, device, 0, 0); + return do_mkfs_opts (fstype, device, 0, 0, 0); } int do_mkfs_b (const char *fstype, int blocksize, const char *device) { optargs_bitmask = GUESTFS_MKFS_OPTS_BLOCKSIZE_BITMASK; - return do_mkfs_opts (fstype, device, blocksize, 0); + return do_mkfs_opts (fstype, device, blocksize, 0, 0); } diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml index b0b4af4..2e7ed75 100644 --- a/generator/generator_actions.ml +++ b/generator/generator_actions.ml @@ -5838,10 +5838,10 @@ not refer to a logical volume. See also C."); - ("mkfs_opts", (RErr, [String "fstype"; Device "device"], [Int "blocksize"; String "features"]), 278, [], + ("mkfs_opts", (RErr, [String "fstype"; Device "device"], [Int "blocksize"; String "features"; Int "inode"]), 278, [], [InitEmpty, Always, TestOutput ( [["part_disk"; "/dev/sda"; "mbr"]; - ["mkfs_opts"; "ext2"; "/dev/sda1"; "4096"; ""]; + ["mkfs_opts"; "ext2"; "/dev/sda1"; "4096"; ""; "256"]; ["mount_options"; ""; "/dev/sda1"; "/"]; ["write"; "/new"; "new file contents"]; ["cat"; "/new"]], "new file contents")], @@ -5876,6 +5876,11 @@ for more details. You cannot use this optional parameter with the C or C filesystem type. +=item C + +This passes the I<-I> parameter to the external L program +which sets the inode size (only for ext2/3/4 filesystems at present). + =back"); ("getxattr", (RBufferOut "xattr", [Pathname "path"; String "name"], []), 279, [Optional "linuxxattrs"], -- 1.8.3.1