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

* util/grub-editenv.c (help_filter, argp): Document how to delete

Browse source 
the whole environment block.
Reported by Dan Jacobson.  Fixes Debian bug #726265.
This commit is contained in:
Colin Watson 2013-11-13 02:15:57 +00:00
parent 3809f0163b
commit d0d1e3dacb
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-11-13 Colin Watson <cjwatson@ubuntu.com>
* util/grub-editenv.c (help_filter, argp): Document how to delete
the whole environment block.
Reported by Dan Jacobson. Fixes Debian bug #726265.
2013-11-13 Colin Watson <cjwatson@ubuntu.com> 2013-11-13 Colin Watson <cjwatson@ubuntu.com>
* docs/grub.texi (Internationalisation, Supported kernels): Fix * docs/grub.texi (Internationalisation, Supported kernels): Fix

6
util/grub-editenv.c
View file

@ -93,7 +93,7 @@ help_filter (int key, const char *text, void *input __attribute__ ((unused)))
switch (key) switch (key)
{ {
case ARGP_KEY_HELP_POST_DOC: case ARGP_KEY_HELP_POST_DOC:
return xasprintf(text, DEFAULT_ENVBLK_PATH); return xasprintf (text, DEFAULT_ENVBLK_PATH, DEFAULT_ENVBLK_PATH);
default: default:
return (char *) text; return (char *) text;
@ -105,7 +105,9 @@ struct argp argp = {
"\n"N_("\ "\n"N_("\
Tool to edit environment block.") Tool to edit environment block.")
"\v"N_("\ "\v"N_("\
If FILENAME is `-', the default value %s is used."), If FILENAME is `-', the default value %s is used.\n\n\
There is no `delete' command; if you want to delete the whole environment\n\
block, use `rm %s'."),
NULL, help_filter, NULL NULL, help_filter, NULL
}; };