proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-07-27 13:51:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add GRUB_RECOVERY_TITLE option

Browse Source 
This allows the controversial "recovery mode" text to be customised.

Bug-Ubuntu: https://bugs.launchpad.net/bugs/1240360
Forwarded: no
Last-Update: 2013-12-25

Patch-Name: mkconfig-recovery-title.patch
This commit is contained in:
Colin Watson 2014-01-13 12:13:33 +00:00 committed by Colin Watson
parent f8d8c2e9df
commit fd81fffa2d
7 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/grub.texi
View File

@ -1577,6 +1577,11 @@ a console is restricted or limited.
This option is only effective when GRUB was configured with the This option is only effective when GRUB was configured with the
@option{--enable-quick-boot} option. @option{--enable-quick-boot} option.
@item GRUB_RECOVERY_TITLE
This option sets the English text of the string that will be displayed in
parentheses to indicate that a boot option is provided to help users recover
a broken system. The default is "recovery mode".
@end table @end table
The following options are still accepted for compatibility with existing The following options are still accepted for compatibility with existing

7
util/grub-mkconfig.in
View File

@ -201,6 +201,10 @@ GRUB_ACTUAL_DEFAULT="$GRUB_DEFAULT"
if [ "x${GRUB_ACTUAL_DEFAULT}" = "xsaved" ] ; then GRUB_ACTUAL_DEFAULT="`"${grub_editenv}" - list | sed -n '/^saved_entry=/ s,^saved_entry=,,p'`" ; fi if [ "x${GRUB_ACTUAL_DEFAULT}" = "xsaved" ] ; then GRUB_ACTUAL_DEFAULT="`"${grub_editenv}" - list | sed -n '/^saved_entry=/ s,^saved_entry=,,p'`" ; fi
if [ "x${GRUB_RECOVERY_TITLE}" = "x" ]; then
GRUB_RECOVERY_TITLE="recovery mode"
fi
# These are defined in this script, export them here so that user can # These are defined in this script, export them here so that user can
# override them. # override them.
@ -257,7 +261,8 @@ export GRUB_DEFAULT \
GRUB_BADRAM \ GRUB_BADRAM \
GRUB_OS_PROBER_SKIP_LIST \ GRUB_OS_PROBER_SKIP_LIST \
GRUB_DISABLE_SUBMENU \ GRUB_DISABLE_SUBMENU \
GRUB_RECORDFAIL_TIMEOUT GRUB_RECORDFAIL_TIMEOUT \
GRUB_RECOVERY_TITLE
if test "x${grub_cfg}" != "x"; then if test "x${grub_cfg}" != "x"; then
rm -f "${grub_cfg}.new" rm -f "${grub_cfg}.new"

4
util/grub.d/10_hurd.in
View File

@ -88,8 +88,8 @@ hurd_entry () {
if [ x$type != xsimple ] ; then if [ x$type != xsimple ] ; then
if [ x$type = xrecovery ] ; then if [ x$type = xrecovery ] ; then
title="$(gettext_printf "%s, with Hurd %s (recovery mode)" "${OS}" "${kernel_base}")" title="$(gettext_printf "%s, with Hurd %s (%s)" "${OS}" "${kernel_base}" "$(gettext "${GRUB_RECOVERY_TITLE}")")"
oldtitle="$OS using $kernel_base (recovery mode)" oldtitle="$OS using $kernel_base ($GRUB_RECOVERY_TITLE)"
else else
title="$(gettext_printf "%s, with Hurd %s" "${OS}" "${kernel_base}")" title="$(gettext_printf "%s, with Hurd %s" "${OS}" "${kernel_base}")"
oldtitle="$OS using $kernel_base" oldtitle="$OS using $kernel_base"

2
util/grub.d/10_kfreebsd.in
View File

@ -76,7 +76,7 @@ kfreebsd_entry ()
fi fi
if [ x$type != xsimple ] ; then if [ x$type != xsimple ] ; then
if [ x$type = xrecovery ] ; then if [ x$type = xrecovery ] ; then
title="$(gettext_printf "%s, with kFreeBSD %s (recovery mode)" "${os}" "${version}")" title="$(gettext_printf "%s, with kFreeBSD %s (%s)" "${os}" "${version}" "$(gettext "${GRUB_RECOVERY_TITLE}")")"
else else
title="$(gettext_printf "%s, with kFreeBSD %s" "${os}" "${version}")" title="$(gettext_printf "%s, with kFreeBSD %s" "${os}" "${version}")"
fi fi

2
util/grub.d/10_linux.in
View File

@ -126,7 +126,7 @@ linux_entry ()
if [ x$type != xsimple ] ; then if [ x$type != xsimple ] ; then
case $type in case $type in
recovery) recovery)
title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; title="$(gettext_printf "%s, with Linux %s (%s)" "${os}" "${version}" "$(gettext "${GRUB_RECOVERY_TITLE}")")" ;;
*) *)
title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
esac esac

2
util/grub.d/10_netbsd.in
View File

@ -102,7 +102,7 @@ netbsd_entry ()
if [ x$type != xsimple ] ; then if [ x$type != xsimple ] ; then
if [ x$type = xrecovery ] ; then if [ x$type = xrecovery ] ; then
title="$(gettext_printf "%s, with kernel %s (via %s, recovery mode)" "${OS}" "$(echo ${kernel} | sed -e 's,^.*/,,')" "${loader}")" title="$(gettext_printf "%s, with kernel %s (via %s, %s)" "${OS}" "$(echo ${kernel} | sed -e 's,^.*/,,')" "${loader}" "$(gettext "${GRUB_RECOVERY_TITLE}")")"
else else
title="$(gettext_printf "%s, with kernel %s (via %s)" "${OS}" "$(echo ${kernel} | sed -e 's,^.*/,,')" "${loader}")" title="$(gettext_printf "%s, with kernel %s (via %s)" "${OS}" "$(echo ${kernel} | sed -e 's,^.*/,,')" "${loader}")"
fi fi

2
util/grub.d/20_linux_xen.in
View File

@ -122,7 +122,7 @@ linux_entry_xsm ()
fi fi
if [ x$type != xsimple ] ; then if [ x$type != xsimple ] ; then
if [ x$type = xrecovery ] ; then if [ x$type = xrecovery ] ; then
title="$(gettext_printf "%s, with Xen %s and Linux %s (recovery mode)" "${os}" "${xen_version}" "${version}")" title="$(gettext_printf "%s, with Xen %s and Linux %s (%s)" "${os}" "${xen_version}" "${version}" "$(gettext "${GRUB_RECOVERY_TITLE}")")"
else else
title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")" title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")"
fi fi