search for: 841c202

...RE); + optargs.label = label; + optargs.bitmask |= GUESTFS_MKFS_OPTS_LABEL_BITMASK; } + + if (guestfs_mkfs_opts_argv (g, filesystem, dev, &optargs) == -1) + exit (EXIT_FAILURE); } if (free_dev) diff --git a/make-fs/make-fs.c b/make-fs/make-fs.c index 841c202..14729ad 100644 --- a/make-fs/make-fs.c +++ b/make-fs/make-fs.c @@ -755,9 +755,15 @@ do_make_fs (const char *input, const char *output_str) /* Create the filesystem. */ if (STRNEQ (type, "btrfs")) { int r; + struct guestfs_mkfs_opts_argv optargs = { .bitmask = 0 }; + + if...

Add the 'label' optional argument to the mkfs action, so it is possible to set a filesystem label direct when creating it. There may be filesystems not supporting changing the label of existing filesystems but only setting it at creation time, so this new optarg will help. Implement it for the most common filesystems (ext*, fat, ntfs, btrfs, xfs), giving an error for all the others, just

...isplay_short_options (options); else if (STREQ (long_options[option_index].name, "keys-from-stdin")) { keys_from_stdin = 1; } else if (STREQ (long_options[option_index].name, "echo-keys")) { diff --git a/make-fs/make-fs.c b/make-fs/make-fs.c index 406aa1d..841c202 100644 --- a/make-fs/make-fs.c +++ b/make-fs/make-fs.c @@ -59,6 +59,7 @@ static const struct option long_options[] = { { "label", 1, 0, 0 }, { "long-options", 0, 0, 0 }, { "partition", 2, 0, 0 }, + { "short-options", 0, 0, 0 }, { "size"...