[SCM] live-build branch, debian, updated. debian/3.0_a47-1-8-g3a864f6

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 224a2304c872e8c3143bb88cb77a35be4bc81e4a
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Apr 29 09:30:50 2012 +0200

    Adding failsafe entries for syslinux bootloaders in embedded configs.

diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index 621c9f0..153acf2 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -182,6 +182,7 @@ then
 			    -e "s|@KERNEL@|/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" \
 			"${_TARGET}/live.cfg.in" >> "${_TARGET}/live.cfg"
 
 			rm -f "${_TARGET}/live.cfg.in"
@@ -201,6 +202,7 @@ then
 				    -e "s|@KERNEL@|/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" \
 				"${_TARGET}/live.cfg.in" >> "${_TARGET}/live.cfg"
 			done
 
@@ -209,7 +211,8 @@ then
 	esac
 elif [ -e "${_TARGET}/live.cfg" ]
 then
-	sed -i -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
+	sed -i  -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
+		-e "s|@LB_BOOTAPPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \
 	${_TARGET}/live.cfg
 fi
 
diff --git a/share/bootloaders/isolinux/live.cfg.in b/share/bootloaders/isolinux/live.cfg.in
index aa01795..e89e59c 100644
--- a/share/bootloaders/isolinux/live.cfg.in
+++ b/share/bootloaders/isolinux/live.cfg.in
@@ -3,3 +3,9 @@ label live- at FLAVOUR@
 	menu default
 	kernel @KERNEL@
 	append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@
+
+label live- at FLAVOUR@-failsafe
+	menu label ^Live (@FLAVOUR@ failsafe)
+	menu default
+	kernel @KERNEL@
+	append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
diff --git a/share/bootloaders/pxelinux/live.cfg.in b/share/bootloaders/pxelinux/live.cfg.in
index aa01795..e89e59c 100644
--- a/share/bootloaders/pxelinux/live.cfg.in
+++ b/share/bootloaders/pxelinux/live.cfg.in
@@ -3,3 +3,9 @@ label live- at FLAVOUR@
 	menu default
 	kernel @KERNEL@
 	append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@
+
+label live- at FLAVOUR@-failsafe
+	menu label ^Live (@FLAVOUR@ failsafe)
+	menu default
+	kernel @KERNEL@
+	append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
diff --git a/share/bootloaders/syslinux/live.cfg.in b/share/bootloaders/syslinux/live.cfg.in
index aa01795..e89e59c 100644
--- a/share/bootloaders/syslinux/live.cfg.in
+++ b/share/bootloaders/syslinux/live.cfg.in
@@ -3,3 +3,9 @@ label live- at FLAVOUR@
 	menu default
 	kernel @KERNEL@
 	append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@
+
+label live- at FLAVOUR@-failsafe
+	menu label ^Live (@FLAVOUR@ failsafe)
+	menu default
+	kernel @KERNEL@
+	append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@

-- 
live-build