[SCM] live-build branch, debian-next, updated. debian/2.0_a28-1-3-gcb869ef

Daniel Baumann daniel at debian.org
Wed Sep 15 11:21:43 UTC 2010


The following commit has been merged in the debian-next branch:
commit cb869ef87336c4abfe31f3ebd89252c5c9438a63
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 15 13:19:04 2010 +0200

    Fixing lb_binary_syslinux to add quiet for the default live entries.

diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index 8e28634..a613381 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -90,6 +90,9 @@ Syslinux_live_entry ()
 	INITRD="${4}"
 	APPEND="${5}"
 
+	# Boot in quiet mode where appropriate
+	QAPPEND="quiet"
+
 	case "${LB_BINARY_IMAGES}" in
 		iso*|usb*)
 			NUMBER="$(ls -1 ${KERNEL_PATH} | grep 'vmlinuz[0-9]\+$' | wc -l)"
@@ -127,7 +130,7 @@ Syslinux_live_entry ()
 	fi
 
 	LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} live-config ${LB_BOOTAPPEND_LIVE} ${APPEND}\n"
+	LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} live-config ${LB_BOOTAPPEND_LIVE} ${APPEND} ${QAPPEND}\n"
 
 	# Failsafe kernel
 	LINUX_LIVE="${LINUX_LIVE}\nlabel ${LABEL}failsafe\n"

-- 
live-build



More information about the debian-live-changes mailing list