From 64c9c8398b67d4bc72ed68a8bd584c71a0eae343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= Date: Fri, 23 Jul 2010 23:03:57 +0200 Subject: [PATCH] Remove trailing space from make_fs_ options. The "-d name=" option doesn't appear as necessary with mkfs.xfs, at least with version 3.1.2 of mkfs.xfs (of course, tested with a file instead of a device). This simplifies a TODO item. --- TODO | 3 +-- bin/xen-create-image | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/TODO b/TODO index e9b490a..47d9ee7 100644 --- a/TODO +++ b/TODO @@ -15,8 +15,7 @@ Minor bugs to fix and features to add before a 4.2 release * Test and support more file system types. Actually this should be pretty simple now that the parameters are - stored in the configuration hash. The only issue is that trailing - whitespace is missing from the "make_fs_foo" option. + stored in the configuration hash. * Setup locales in the hooks? diff --git a/bin/xen-create-image b/bin/xen-create-image index fcaaffa..576fb1a 100755 --- a/bin/xen-create-image +++ b/bin/xen-create-image @@ -1397,11 +1397,11 @@ sub setupDefaultOptions # filesystem, even if it exists. This script must detect # prior existance itself. # - $CONFIG{ 'make_fs_ext2' } = 'mkfs.ext2 -F '; - $CONFIG{ 'make_fs_ext3' } = 'mkfs.ext3 -F '; - $CONFIG{ 'make_fs_ext4' } = 'mkfs.ext4 -F '; - $CONFIG{ 'make_fs_xfs' } = 'mkfs.xfs -f -d name='; - $CONFIG{ 'make_fs_reiserfs' } = 'mkfs.reiserfs -f -q '; + $CONFIG{ 'make_fs_ext2' } = 'mkfs.ext2 -F'; + $CONFIG{ 'make_fs_ext3' } = 'mkfs.ext3 -F'; + $CONFIG{ 'make_fs_ext4' } = 'mkfs.ext4 -F'; + $CONFIG{ 'make_fs_xfs' } = 'mkfs.xfs -f'; + $CONFIG{ 'make_fs_reiserfs' } = 'mkfs.reiserfs -f -q'; # # Flags to pass to "mount" to mount our image. @@ -3358,7 +3358,7 @@ sub createFilesystem # logprint("\nCreating $fs filesystem on $image\n"); - $command .= $image; + $command .= " " . $image; runCommand($command); logprint("Done\n");