[SCM] debian-live/live-helper branch, master, updated. 1.0_a39-1-13-g92a0b19

Daniel Baumann daniel at debian.org
Sun Mar 9 08:58:46 UTC 2008


The following commit has been merged in the master branch:
commit 206f3b3f21d8877d7792a2a9a9aa9390182b6f95
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Thu Mar 6 03:40:42 2008 +0000

    Don't append 'quiet' kernel parameter in rescue modes
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index ba0d572..d8aab00 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -136,21 +136,21 @@ Syslinux_install_entry ()
 	INITRD="${3}"
 	APPEND="${4}"
 
-	# Boot in quiet mode
-	if [ "${LH_DISTRIBUTION}" != "etch" ] && [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
+	# Boot in quiet mode where appropriate
+	if [ "${LH_DISTRIBUTION}" != "etch" ]
 	then
-		APPEND="${APPEND} quiet"
+		QAPPEND="quiet"
 	fi
 
 	for TYPE in Install Expert Rescue Auto
 	do
 		case "${TYPE}" in
 			Install)
-				TAPPEND="${APPEND}"
+				TAPPEND="${APPEND} ${QAPPEND}"
 				;;
 
 			Expert)
-				TAPPEND="priority=low ${APPEND}"
+				TAPPEND="priority=low ${APPEND} ${QAPPEND}"
 				;;
 
 			Rescue)

-- 
debian-live/live-helper



More information about the debian-live-changes mailing list