[SCM] live-build branch, debian-next, updated. debian/3.0_a60-1-3-ga9bb541

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit a9bb5418c9b9a0b034cb527d3f3a7f3cb274a9de
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Sep 30 09:20:15 2012 +0200

    Using initramfs generator specific boot parameters in syslinux configuration files.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 8af9c84..cc5c92d 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -986,6 +986,16 @@ Set_defaults ()
 	LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
 
 	# LB_BOOTAPPEND_LIVE
+	case "${LB_MODE}" in
+		ubuntu)
+			LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=casper}"
+			;;
+
+		*)
+			LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=live config}"
+			;;
+	esac
+
 	if [ -n "${LB_DEBIAN_INSTALLER_PRESEEDFILE}" ]
 	then
 		case "${LB_BINARY_IMAGES}" in
diff --git a/share/bootloaders/extlinux/live.cfg.in b/share/bootloaders/extlinux/live.cfg.in
index 749dd24..8dca4d5 100644
--- a/share/bootloaders/extlinux/live.cfg.in
+++ b/share/bootloaders/extlinux/live.cfg.in
@@ -3,11 +3,11 @@ label live- at FLAVOUR@
 	menu default
 	kernel @KERNEL@
 	initrd @INITRD@
-	append boot=live config @LB_BOOTAPPEND_LIVE@
+	append @LB_BOOTAPPEND_LIVE@
 
 label live- at FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
 	menu default
 	kernel @KERNEL@
 	initrd @INITRD@
-	append boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
+	append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
diff --git a/share/bootloaders/isolinux/live.cfg.in b/share/bootloaders/isolinux/live.cfg.in
index 749dd24..8dca4d5 100644
--- a/share/bootloaders/isolinux/live.cfg.in
+++ b/share/bootloaders/isolinux/live.cfg.in
@@ -3,11 +3,11 @@ label live- at FLAVOUR@
 	menu default
 	kernel @KERNEL@
 	initrd @INITRD@
-	append boot=live config @LB_BOOTAPPEND_LIVE@
+	append @LB_BOOTAPPEND_LIVE@
 
 label live- at FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
 	menu default
 	kernel @KERNEL@
 	initrd @INITRD@
-	append boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
+	append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
diff --git a/share/bootloaders/pxelinux/live.cfg.in b/share/bootloaders/pxelinux/live.cfg.in
index 749dd24..8dca4d5 100644
--- a/share/bootloaders/pxelinux/live.cfg.in
+++ b/share/bootloaders/pxelinux/live.cfg.in
@@ -3,11 +3,11 @@ label live- at FLAVOUR@
 	menu default
 	kernel @KERNEL@
 	initrd @INITRD@
-	append boot=live config @LB_BOOTAPPEND_LIVE@
+	append @LB_BOOTAPPEND_LIVE@
 
 label live- at FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
 	menu default
 	kernel @KERNEL@
 	initrd @INITRD@
-	append boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
+	append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
diff --git a/share/bootloaders/syslinux/live.cfg.in b/share/bootloaders/syslinux/live.cfg.in
index 749dd24..8dca4d5 100644
--- a/share/bootloaders/syslinux/live.cfg.in
+++ b/share/bootloaders/syslinux/live.cfg.in
@@ -3,11 +3,11 @@ label live- at FLAVOUR@
 	menu default
 	kernel @KERNEL@
 	initrd @INITRD@
-	append boot=live config @LB_BOOTAPPEND_LIVE@
+	append @LB_BOOTAPPEND_LIVE@
 
 label live- at FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
 	menu default
 	kernel @KERNEL@
 	initrd @INITRD@
-	append boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
+	append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@

-- 
live-build