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

the whole environment block.
Reported by Dan Jacobson.  Fixes Debian bug #726265.

diff --git a/ChangeLog b/ChangeLog
index 22b20d2..716f69c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * docs/grub.texi (Internationalisation, Supported kernels): Fix

diff --git a/util/grub-editenv.c b/util/grub-editenv.c
index 50be778..cffcf9e 100644 (file)
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@@ -93,7 +93,7 @@ help_filter (int key, const char *text, void *input __attribute__ ((unused)))
   switch (key)
     {
       case ARGP_KEY_HELP_POST_DOC:
-        return xasprintf(text, DEFAULT_ENVBLK_PATH);
+        return xasprintf (text, DEFAULT_ENVBLK_PATH, DEFAULT_ENVBLK_PATH);
 
       default:
         return (char *) text;
@@ -105,7 +105,9 @@ struct argp argp = {
   "\n"N_("\
 Tool to edit environment block.")
 "\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
 };