summaryrefslogtreecommitdiff
path: root/scripts/build/binary_grub-legacy
diff options
context:
space:
mode:
authorjnqnfe <jnqnfe@gmail.com>2015-01-11 21:14:49 +0000
committerLyndon Brown <jnqnfe@gmail.com>2020-03-16 16:29:00 +0000
commita33938f8d47f23c23335ecf671b1db9afcd0b726 (patch)
tree841c029ad48fa9983c67b66c4d847dedbf1182a9 /scripts/build/binary_grub-legacy
parent7d4fc9320554e50cc48844976ad95ad5809a496f (diff)
downloadvyos-live-build-a33938f8d47f23c23335ecf671b1db9afcd0b726.tar.gz
vyos-live-build-a33938f8d47f23c23335ecf671b1db9afcd0b726.zip
grub1/grub2/loopback: fix order of quiet kernel parameters in menus
I believe that the `quiet` parameter is meant for d-i not the kernel and thus should be given on the end after a delimiter, as done with syslinux. Here we switch the order to move it to the end. The addition of the missing delimiter will be done in a followup commit. (See #775143) Gbp-Dch: Short
Diffstat (limited to 'scripts/build/binary_grub-legacy')
-rwxr-xr-xscripts/build/binary_grub-legacy10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build/binary_grub-legacy b/scripts/build/binary_grub-legacy
index d2736294e..c0b74888c 100755
--- a/scripts/build/binary_grub-legacy
+++ b/scripts/build/binary_grub-legacy
@@ -73,19 +73,19 @@ Grub_install_entry ()
do
case "${TYPE}" in
Install)
- TAPPEND="${APPEND} ${QAPPEND}"
+ TAPPEND="${APPEND} LB_BOOTAPPEND_INSTALL ${QAPPEND}"
;;
Expert)
- TAPPEND="priority=low ${APPEND}"
+ TAPPEND="priority=low ${APPEND} LB_BOOTAPPEND_INSTALL"
;;
Rescue)
- TAPPEND="rescue/enable=true ${APPEND} ${QAPPEND}"
+ TAPPEND="rescue/enable=true ${APPEND} LB_BOOTAPPEND_INSTALL ${QAPPEND}"
;;
Auto)
- TAPPEND="auto=true priority=critical ${APPEND} ${QAPPEND}"
+ TAPPEND="auto=true priority=critical ${APPEND} LB_BOOTAPPEND_INSTALL ${QAPPEND}"
;;
esac
@@ -100,7 +100,7 @@ Grub_install_entry ()
LINUX_INSTALL="${LINUX_INSTALL}\ntitle\t\t${LABEL} ${TYPE}"
- LINUX_INSTALL="${LINUX_INSTALL}\nkernel\t\t/${KERNEL} ${TAPPEND} ${LB_BOOTAPPEND_INSTALL}"
+ LINUX_INSTALL="${LINUX_INSTALL}\nkernel\t\t/${KERNEL} ${TAPPEND}"
LINUX_INSTALL="${LINUX_INSTALL}\ninitrd\t\t/${INITRD}"
done
}