[SCM] live-build branch, debian-next, updated. debian/3.0_a61-1-10-gfd73a68

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit fd73a6861570a75255615e2f14d1e9e7e2bf0e71
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Oct 1 04:43:14 2012 +0200

    Simplify internal replacement strings when processing syslinux configuration files.

diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 7e694e7..bf2fb03 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -219,10 +219,10 @@ then
 			mv binary/live/initrd.img-* binary/live/initrd.img
 
 			sed -e "s|@FLAVOUR@|${LB_LINUX_FLAVOURS}|g" \
-			    -e "s|@KERNEL@|/live/vmlinuz|g" \
+			    -e "s|@LINUX@|/live/vmlinuz|g" \
 			    -e "s|@INITRD@|/live/initrd.img|g" \
-			    -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
-			    -e "s|@LB_BOOTAPPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \
+			    -e "s|@APPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
+			    -e "s|@APPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \
 			"${_TARGET}/live.cfg.in" >> "${_TARGET}/live.cfg"
 
 			rm -f "${_TARGET}/live.cfg.in"
@@ -239,10 +239,10 @@ then
 				mv binary/live/initrd.img-*-${_FLAVOUR} binary/live/initrd${_NUMBER}.img
 
 				sed -e "s|@FLAVOUR@|${_FLAVOUR}|g" \
-				    -e "s|@KERNEL@|/live/vmlinuz${_NUMBER}|g" \
+				    -e "s|@LINUX@|/live/vmlinuz${_NUMBER}|g" \
 				    -e "s|@INITRD@|/live/initrd${_NUMBER}.img|g" \
-				    -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
-				    -e "s|@LB_BOOTAPPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \
+				    -e "s|@APPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
+				    -e "s|@APPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \
 				"${_TARGET}/live.cfg.in" >> "${_TARGET}/live.cfg"
 			done
 
diff --git a/share/bootloaders/extlinux/live.cfg.in b/share/bootloaders/extlinux/live.cfg.in
index 798fc61..a307a04 100644
--- a/share/bootloaders/extlinux/live.cfg.in
+++ b/share/bootloaders/extlinux/live.cfg.in
@@ -1,13 +1,13 @@
 label live- at FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
 	menu default
-	linux @KERNEL@
+	linux @LINUX@
 	initrd @INITRD@
-	append @LB_BOOTAPPEND_LIVE@
+	append @APPEND_LIVE@
 
 label live- at FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
 	menu default
-	linux @KERNEL@
+	linux @LINUX@
 	initrd @INITRD@
-	append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
+	append @APPEND_LIVE@ @APPEND_FAILSAFE@
diff --git a/share/bootloaders/isolinux/live.cfg.in b/share/bootloaders/isolinux/live.cfg.in
index 798fc61..a307a04 100644
--- a/share/bootloaders/isolinux/live.cfg.in
+++ b/share/bootloaders/isolinux/live.cfg.in
@@ -1,13 +1,13 @@
 label live- at FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
 	menu default
-	linux @KERNEL@
+	linux @LINUX@
 	initrd @INITRD@
-	append @LB_BOOTAPPEND_LIVE@
+	append @APPEND_LIVE@
 
 label live- at FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
 	menu default
-	linux @KERNEL@
+	linux @LINUX@
 	initrd @INITRD@
-	append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
+	append @APPEND_LIVE@ @APPEND_FAILSAFE@
diff --git a/share/bootloaders/pxelinux/live.cfg.in b/share/bootloaders/pxelinux/live.cfg.in
index 798fc61..a307a04 100644
--- a/share/bootloaders/pxelinux/live.cfg.in
+++ b/share/bootloaders/pxelinux/live.cfg.in
@@ -1,13 +1,13 @@
 label live- at FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
 	menu default
-	linux @KERNEL@
+	linux @LINUX@
 	initrd @INITRD@
-	append @LB_BOOTAPPEND_LIVE@
+	append @APPEND_LIVE@
 
 label live- at FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
 	menu default
-	linux @KERNEL@
+	linux @LINUX@
 	initrd @INITRD@
-	append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
+	append @APPEND_LIVE@ @APPEND_FAILSAFE@
diff --git a/share/bootloaders/syslinux/live.cfg.in b/share/bootloaders/syslinux/live.cfg.in
index 798fc61..a307a04 100644
--- a/share/bootloaders/syslinux/live.cfg.in
+++ b/share/bootloaders/syslinux/live.cfg.in
@@ -1,13 +1,13 @@
 label live- at FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
 	menu default
-	linux @KERNEL@
+	linux @LINUX@
 	initrd @INITRD@
-	append @LB_BOOTAPPEND_LIVE@
+	append @APPEND_LIVE@
 
 label live- at FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
 	menu default
-	linux @KERNEL@
+	linux @LINUX@
 	initrd @INITRD@
-	append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
+	append @APPEND_LIVE@ @APPEND_FAILSAFE@

-- 
live-build