vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* util/grub-fstest.c (options): Remove OPTION_ARG_OPTIONAL from options 

without argument.
	* util/grub-mount.c (options): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-03-06 11:38:50 +01:00
parent bbc5a342eb
commit 97ebda9bc6
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2012-03-05 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-fstest.c (options): Remove OPTION_ARG_OPTIONAL from options
without argument.
* util/grub-mount.c (options): Likewise.
2012-03-05 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkimage.c (generate_image): Unify diskboot.img size message.

6
util/grub-fstest.c
View File

@ -452,12 +452,12 @@ static struct argp_option options[] = {
{"length", 'n', "N", 0, N_("Handle N bytes in output file."), 2},
{"diskcount", 'c', "N", 0, N_("Specify the number of input files."), 2},
{"debug", 'd', "S", 0, N_("Set debug environment variable."), 2},
{"crypto", 'C', NULL, OPTION_ARG_OPTIONAL, N_("Mount crypto devices."), 2},
{"crypto", 'C', NULL, 0, N_("Mount crypto devices."), 2},
{"zfs-key", 'K',
/* TRANSLATORS: "prompt" is a keyword. */
N_("FILE|prompt"), 0, N_("Load zfs crypto key."), 2},
{"verbose", 'v', NULL, OPTION_ARG_OPTIONAL, N_("print verbose messages."), 2},
{"uncompress", 'u', NULL, OPTION_ARG_OPTIONAL, N_("Uncompress data."), 2},
{"verbose", 'v', NULL, 0, N_("print verbose messages."), 2},
{"uncompress", 'u', NULL, 0, N_("Uncompress data."), 2},
{0, 0, 0, 0, 0, 0}
};

4
util/grub-mount.c
View File

@ -409,11 +409,11 @@ fuse_init (void)
static struct argp_option options[] = {
{"root", 'r', N_("DEVICE_NAME"), 0, N_("Set root device."), 2},
{"debug", 'd', "S", 0, N_("Set debug environment variable."), 2},
{"crypto", 'C', NULL, OPTION_ARG_OPTIONAL, N_("Mount crypto devices."), 2},
{"crypto", 'C', NULL, 0, N_("Mount crypto devices."), 2},
{"zfs-key", 'K',
/* TRANSLATORS: "prompt" is a keyword. */
N_("FILE|prompt"), 0, N_("Load zfs crypto key."), 2},
{"verbose", 'v', NULL, OPTION_ARG_OPTIONAL, N_("print verbose messages."), 2},
{"verbose", 'v', NULL, 0, N_("print verbose messages."), 2},
{0, 0, 0, 0, 0, 0}
};