[SCM] live-build branch, debian-next, updated. debian/3.0_a42-1-24-g41d7ae7

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 41d7ae75ea9adf74fa9c7736b691fc3fae96ea3d
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Feb 6 14:49:44 2012 +0100

    Looping over bootloader config for multiple linux kernel flavours.

diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index 2ea193c..6668a34 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -170,7 +170,22 @@ case "${LB_BUILD_WITH_CHROOT}" in
 esac
 
 # Configuring files
-if [ -e ${_TARGET}/live.cfg ]
+if [ -e "${_TARGET}/live.cfg.in" ]
+then
+	# FIXME: only works with one kernel version for the time being
+	for _FLAVOUR in ${LB_LINUX_FLAVOURS}
+	do
+		_VERSION="$(basename binary/live/vmlinuz-*-${_FLAVOUR} ${_FLAVOUR} | sed -e 's|vmlinuz-||')"
+
+		sed -e "s|@FLAVOUR@|${_FLAVOUR}|g" \
+		    -e "s|@KERNEL@|/live/vmlinuz-${_VERSION}-${_FLAVOUR}|g" \
+		    -e "s|@INITRD@|/live/initrd.img-${_VERSION}-${_FLAVOUR}|g" \
+		    -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
+		"${_TARGET}/live.cfg.in" >> "${_TARGET}/live.cfg"
+	done
+
+	rm -f "${_TARGET}/live.cfg.in"
+elif [ -e "${_TARGET}/live.cfg" ]
 then
 	sed -i -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
 	${_TARGET}/live.cfg
diff --git a/share/bootloaders/isolinux/live.cfg b/share/bootloaders/isolinux/live.cfg
deleted file mode 100644
index 9c87ffe..0000000
--- a/share/bootloaders/isolinux/live.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-default live
-label live
-	menu label ^Live
-	menu default
-	kernel /live/vmlinuz
-	append initrd=/live/initrd.img boot=live config @LB_BOOTAPPEND_LIVE@
diff --git a/share/bootloaders/isolinux/live.cfg.in b/share/bootloaders/isolinux/live.cfg.in
new file mode 100644
index 0000000..6337a3d
--- /dev/null
+++ b/share/bootloaders/isolinux/live.cfg.in
@@ -0,0 +1,7 @@
+default live
+
+label live- at FLAVOUR@
+	menu label ^Live (@FLAVOUR@)
+	menu default
+	kernel @KERNEL@
+	append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@
diff --git a/share/bootloaders/pxelinux/live.cfg b/share/bootloaders/pxelinux/live.cfg
deleted file mode 100644
index 9c87ffe..0000000
--- a/share/bootloaders/pxelinux/live.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-default live
-label live
-	menu label ^Live
-	menu default
-	kernel /live/vmlinuz
-	append initrd=/live/initrd.img boot=live config @LB_BOOTAPPEND_LIVE@
diff --git a/share/bootloaders/pxelinux/live.cfg.in b/share/bootloaders/pxelinux/live.cfg.in
new file mode 100644
index 0000000..6337a3d
--- /dev/null
+++ b/share/bootloaders/pxelinux/live.cfg.in
@@ -0,0 +1,7 @@
+default live
+
+label live- at FLAVOUR@
+	menu label ^Live (@FLAVOUR@)
+	menu default
+	kernel @KERNEL@
+	append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@
diff --git a/share/bootloaders/syslinux/live.cfg b/share/bootloaders/syslinux/live.cfg
deleted file mode 100644
index 9c87ffe..0000000
--- a/share/bootloaders/syslinux/live.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-default live
-label live
-	menu label ^Live
-	menu default
-	kernel /live/vmlinuz
-	append initrd=/live/initrd.img boot=live config @LB_BOOTAPPEND_LIVE@
diff --git a/share/bootloaders/syslinux/live.cfg.in b/share/bootloaders/syslinux/live.cfg.in
new file mode 100644
index 0000000..6337a3d
--- /dev/null
+++ b/share/bootloaders/syslinux/live.cfg.in
@@ -0,0 +1,7 @@
+default live
+
+label live- at FLAVOUR@
+	menu label ^Live (@FLAVOUR@)
+	menu default
+	kernel @KERNEL@
+	append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@

-- 
live-build