From: cjwatson <cjwatson@localhost>
Date: Mon, 26 Oct 2009 16:33:13 +0000 (+0000)
Subject: 2009-10-26  Colin Watson  <cjwatson@ubuntu.com>
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9031b03aaca8c601f60e13ab5cc9f032094cb119;p=grub2.git

2009-10-26  Colin Watson  <cjwatson@ubuntu.com>

	* util/grub-editenv.c (main): If only a command is given, use
	DEFAULT_DIRECTORY "/" GRUB_ENVBLK_DEFCFG as a default file name.
	(usage): FILENAME is now optional and has a default.
---

diff --git a/ChangeLog b/ChangeLog
index e7e01fa37..ab7ccf39c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-26  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-editenv.c (main): If only a command is given, use
+	DEFAULT_DIRECTORY "/" GRUB_ENVBLK_DEFCFG as a default file name.
+	(usage): FILENAME is now optional and has a default.
+
 2009-10-26  Colin Watson  <cjwatson@ubuntu.com>
 
 	Improve grub-mkconfig performance when there are several menu
diff --git a/util/grub-editenv.c b/util/grub-editenv.c
index a8dc137c5..5b688d9cb 100644
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@@ -72,7 +72,7 @@ usage (int status)
     fprintf (stderr, "Try ``grub-editenv --help'' for more information.\n");
   else
     printf ("\
-Usage: grub-editenv [OPTIONS] FILENAME COMMAND\n\
+Usage: grub-editenv [OPTIONS] [FILENAME] COMMAND\n\
 \n\
 Tool to edit environment block.\n\
 \nCommands:\n\
@@ -85,7 +85,10 @@ Tool to edit environment block.\n\
   -V, --version             print version information and exit\n\
   -v, --verbose             print verbose messages\n\
 \n\
-Report bugs to <%s>.\n", PACKAGE_BUGREPORT);
+If not given explicitly, FILENAME defaults to %s.\n\
+\n\
+Report bugs to <%s>.\n",
+DEFAULT_DIRECTORY "/" GRUB_ENVBLK_DEFCFG, PACKAGE_BUGREPORT);
 
   exit (status);
 }
@@ -288,12 +291,14 @@ main (int argc, char *argv[])
 
   if (optind + 1 >= argc)
     {
-      fprintf (stderr, "no command specified\n");
-      usage (1);
+      filename = DEFAULT_DIRECTORY "/" GRUB_ENVBLK_DEFCFG;
+      command = argv[optind];
+    }
+  else
+    {
+      filename = argv[optind];
+      command = argv[optind + 1];
     }
-
-  filename = argv[optind];
-  command = argv[optind + 1];
 
   if (strcmp (command, "create") == 0)
     create_envblk_file (filename);