manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grub2|loopback: allow providing hotkey to menu entry creation helpers

This commit is contained in:
Lyndon Brown 2020-03-24 22:09:35 +00:00 committed by Raphaël Hertzog
parent 40a076bf35
commit 6e86a6480c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/build/binary_loopback_cfg
View File

@ -50,9 +50,10 @@ Grub_menu_entry() {
local KERNEL="$2" local KERNEL="$2"
local INITRD="$3" local INITRD="$3"
local APPEND="$4" local APPEND="$4"
local HOTKEY="${5:+ --hotkey=$5}"
cat <<END cat <<END
menuentry "$LABEL" { menuentry "${LABEL}"${HOTKEY} {
linux $KERNEL $APPEND linux $KERNEL $APPEND
initrd $INITRD initrd $INITRD
} }
@ -71,6 +72,7 @@ Grub_install_entry ()
local KERNEL="${3}" local KERNEL="${3}"
local INITRD="${4}" local INITRD="${4}"
local APPEND="${5}" local APPEND="${5}"
local HOTKEY="${6}"
# Drop "quiet" kernel parameter for expert entries # Drop "quiet" kernel parameter for expert entries
case $TYPE in case $TYPE in
@ -81,10 +83,10 @@ Grub_install_entry ()
if [ -z "$LINUX_INSTALL" ]; then if [ -z "$LINUX_INSTALL" ]; then
# First entry recorded in LINUX_INSTALL # First entry recorded in LINUX_INSTALL
LINUX_INSTALL="$(Grub_menu_entry "$LABEL" "$KERNEL" "$INITRD" "$APPEND")$NL" LINUX_INSTALL="$(Grub_menu_entry "$LABEL" "$KERNEL" "$INITRD" "$APPEND" "$HOTKEY")$NL"
else else
# Remaining entries recorded in LINUX_ADVANCED_INSTALL # Remaining entries recorded in LINUX_ADVANCED_INSTALL
LINUX_ADVANCED_INSTALL="$LINUX_ADVANCED_INSTALL$(Grub_menu_entry "$LABEL" "$KERNEL" "$INITRD" "$APPEND")$NL" LINUX_ADVANCED_INSTALL="$LINUX_ADVANCED_INSTALL$(Grub_menu_entry "$LABEL" "$KERNEL" "$INITRD" "$APPEND" "$HOTKEY")$NL"
fi fi
} }