From aadf8c4cacecc4664412c6bbc7b8e039e1dd772a Mon Sep 17 00:00:00 2001
From: jnqnfe <jnqnfe@gmail.com>
Date: Sun, 11 Jan 2015 21:25:18 +0000
Subject: grub1/grub2/loopback: fix missing delimiter in menu kernel parameter
 lists

The '---' delimiter should appear before the final 'quiet' parameter
(which is used by the debian installer I believe).

This delimiter is added by live-build in syslinux configs, and is present
in both grub2 and syslinux configs in an official debian 7.7 disc image,
suggesting strongly that live-build grub/grub2 menu creation code is in
the wrong here by missing it.

update: this commit previously used -- as was correct at the time, and has
since been updated to use --- per #775128; which was previously tackled in
a separate later commit. the switch to --- was already done for syslinux
(which was not missing the delimiter unlike grub) in
ba6b9adeff634845a9ab7cbd5218257a7aa254ab

Gbp-Dch: Short
Closes: #775143
---
 scripts/build/binary_grub-legacy  | 3 +--
 scripts/build/binary_loopback_cfg | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build/binary_grub-legacy b/scripts/build/binary_grub-legacy
index c0b74888c..39d647a02 100755
--- a/scripts/build/binary_grub-legacy
+++ b/scripts/build/binary_grub-legacy
@@ -67,7 +67,7 @@ Grub_install_entry ()
 	INITRD="${3}"
 	APPEND="${4}"
 
-	QAPPEND="quiet"
+	QAPPEND="--- quiet"
 
 	for TYPE in Install Expert Rescue Auto
 	do
@@ -98,7 +98,6 @@ Grub_install_entry ()
 				;;
 		esac
 
-
 		LINUX_INSTALL="${LINUX_INSTALL}\ntitle\t\t${LABEL} ${TYPE}"
 		LINUX_INSTALL="${LINUX_INSTALL}\nkernel\t\t/${KERNEL} ${TAPPEND}"
 		LINUX_INSTALL="${LINUX_INSTALL}\ninitrd\t\t/${INITRD}"
diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg
index 08629332d..5bb349ec3 100755
--- a/scripts/build/binary_loopback_cfg
+++ b/scripts/build/binary_loopback_cfg
@@ -75,7 +75,7 @@ Grub_install_entry ()
 	# Drop "quiet" kernel parameter for expert entries
 	case $TYPE in
 		expert|expertgui)
-			APPEND=$(echo "$APPEND" | sed -e 's/ quiet//')
+			APPEND=$(echo "$APPEND" | sed -e 's/ --- quiet//')
 			;;
 	esac
 
@@ -233,11 +233,11 @@ if [ "${LB_DEBIAN_INSTALLER}" != "none" ]
 then
 	KERNEL_DI="/install/vmlinuz"
 	INITRD_DI="/install/initrd.gz"
-	APPEND_DI="vga=normal ${LB_BOOTAPPEND_INSTALL} quiet"
+	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 ${LB_BOOTAPPEND_INSTALL} quiet"
+	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}"
-- 
cgit v1.2.3