mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-25 00:29:23 +00:00
Use submenus in grub-mkconfig.
* util/grub-mkconfig.in: Define GRUB_ACTUAL_DEFAULT. * util/grub-mkconfig_lib.in (grub_quote): New function. (gettext_printf): Use gettext and not gettext_quoted to fix several messages. * util/grub.d/10_hurd.in: Use submenus. * util/grub.d/10_kfreebsd.in: Likewise. * util/grub.d/10_linux.in: Likewise. * util/grub.d/10_netbsd.in: Likewise. * util/grub.d/20_linux_xen.in: Likewise. * util/grub.d/30_os-prober.in: Likewise. * util/grub.d/10_illumos.in: Add missing quoting. * util/grub.d/10_windows.in: Likewise.
This commit is contained in:
1 parent
d9bef9bc43
commit
0cdc126ca2
11 files changed
+424
-154
No files matched your search
@@ -239,6 +239,11 @@ version_find_latest ()
|
||||
# One layer of quotation is eaten by "", the second by sed, and the third by
|
||||
# printf; so this turns ' into \'. Note that you must use the output of
|
||||
# this function in a printf format string.
|
||||
|
||||
grub_quote () {
|
||||
sed "s/'/'\\\\\\\\''/g"
|
||||
}
|
||||
|
||||
gettext_quoted () {
|
||||
gettext "$@" | sed "s/'/'\\\\\\\\''/g"
|
||||
}
|
||||
@@ -249,7 +254,7 @@ gettext_quoted () {
|
||||
gettext_printf () {
|
||||
gettext_printf_format="$1"
|
||||
shift
|
||||
printf "$(gettext_quoted "$gettext_printf_format")" "$@"
|
||||
printf "$(gettext "$gettext_printf_format")" "$@"
|
||||
}
|
||||
|
||||
uses_abstraction () {
|
||||
|
||||
Reference in new issue
Block a user