(Per a discussion with Robert on IRC, this can be post-1.97 if you
like.)
Would it make sense for grub-editenv to have a default for the filename?
I dislike hardcoding something in package maintainer scripts that needs
to match a #define. The interface would be a little awkward since it's
grub-editenv FILENAME COMMAND, but we could just say that if you provide
only one argument then we use the default filename.
Index: util/grub-editenv.c
===================================================================
--- util/grub-editenv.c (revision 2556)
+++ util/grub-editenv.c (working copy)
@@ -72,7 +72,7 @@
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 @@
-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);
}
@@ -282,13 +285,15 @@
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);
else if (strcmp (command, "list") == 0)
--
Colin Watson [cjwat...@ubuntu.com]
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
