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

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
This commit is contained in:
jnqnfe 2015-01-11 21:14:49 +00:00 committed by Lyndon Brown
parent 7d4fc93205
commit a33938f8d4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/build/binary_grub-legacy
View File

@ -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
}

4
scripts/build/binary_loopback_cfg
View File

@ -233,11 +233,11 @@ if [ "${LB_DEBIAN_INSTALLER}" != "none" ]
then
KERNEL_DI="/install/vmlinuz"
INITRD_DI="/install/initrd.gz"
APPEND_DI="vga=normal quiet ${LB_BOOTAPPEND_INSTALL}"
APPEND_DI="vga=normal ${LB_BOOTAPPEND_INSTALL} quiet"
KERNEL_GI="/install/gtk/vmlinuz"
INITRD_GI="/install/gtk/initrd.gz"
APPEND_GI="video=vesa:ywrap,mtrr vga=788 quiet ${LB_BOOTAPPEND_INSTALL}"
APPEND_GI="video=vesa:ywrap,mtrr vga=788 ${LB_BOOTAPPEND_INSTALL} quiet"
if [ "${LB_DEBIAN_INSTALLER_GUI}" = "true" ]; then
Grub_install_entry "Start installer" "installgui" "${KERNEL_GI}" "${INITRD_GI}" "${APPEND_GI}"