* util/grub-reboot.in (usage): Document the need for

GRUB_DEFAULT=saved.
* util/grub-set-default.in (usage): Likewise.
Reported by: Brian Candler.  Fixes Ubuntu bug #1102925.
This commit is contained in:
Colin Watson 2013-01-22 14:28:32 +00:00
parent e661c180ea
commit 7782b8a62f
3 changed files with 11 additions and 0 deletions

View file

@ -1,3 +1,10 @@
2013-01-22 Colin Watson <cjwatson@ubuntu.com>
* util/grub-reboot.in (usage): Document the need for
GRUB_DEFAULT=saved.
* util/grub-set-default.in (usage): Likewise.
Reported by: Brian Candler. Fixes Ubuntu bug #1102925.
2013-01-21 Vladimir Serbinenko <phcoder@gmail.com> 2013-01-21 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/libgcrypt_wrap/cipher_wrap.h: Include sys/types.h rather * grub-core/lib/libgcrypt_wrap/cipher_wrap.h: Include sys/types.h rather

View file

@ -20,6 +20,7 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
bindir=@bindir@ bindir=@bindir@
sysconfdir="@sysconfdir@"
PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
@ -45,6 +46,7 @@ export TEXTDOMAINDIR="@localedir@"
usage () { usage () {
gettext_printf "Usage: %s [OPTION] MENU_ENTRY\n" "$self" gettext_printf "Usage: %s [OPTION] MENU_ENTRY\n" "$self"
gettext "Set the default boot menu entry for GRUB, for the next boot only."; echo gettext "Set the default boot menu entry for GRUB, for the next boot only."; echo
gettext_printf "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\n" "$sysconfdir"
echo echo
print_option_help "-h, --help" "$(gettext "print this message and exit")" print_option_help "-h, --help" "$(gettext "print this message and exit")"
print_option_help "-v, --version" "$(gettext "print the version information and exit")" print_option_help "-v, --version" "$(gettext "print the version information and exit")"

View file

@ -20,6 +20,7 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
bindir=@bindir@ bindir=@bindir@
sysconfdir="@sysconfdir@"
PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
@ -45,6 +46,7 @@ export TEXTDOMAINDIR="@localedir@"
usage () { usage () {
gettext_printf "Usage: %s [OPTION] MENU_ENTRY\n" "$self" gettext_printf "Usage: %s [OPTION] MENU_ENTRY\n" "$self"
gettext "Set the default boot menu entry for GRUB."; echo gettext "Set the default boot menu entry for GRUB."; echo
gettext_printf "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\n" "$sysconfdir"
echo echo
print_option_help "-h, --help" "$(gettext "print this message and exit")" print_option_help "-h, --help" "$(gettext "print this message and exit")"
print_option_help "-v, --version" "$(gettext "print the version information and exit")" print_option_help "-v, --version" "$(gettext "print the version information and exit")"