Making failsafe boot parameters fully customizable like the normal ones.

functions/defaults.sh

@@ -990,8 +990,6 @@ Set_defaults ()
 	fi
 
 	# Setting boot parameters
-	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)
@@ -1003,6 +1001,17 @@ Set_defaults ()
 			;;
 	esac
 
+	# LB_BOOTAPPEND_LIVE_FAILSAFE
+	case "${LB_MODE}" in
+		ubuntu)
+			LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-boot=casper memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
+			;;
+
+		*)
+			LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-boot=live config memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
+			;;
+	esac
+
 	if [ -n "${LB_DEBIAN_INSTALLER_PRESEEDFILE}" ]
 	then
 		case "${LB_BINARY_IMAGES}" in

scripts/build/binary_syslinux

@@ -222,7 +222,7 @@ then
 			    -e "s|@LINUX@|/live/vmlinuz|g" \
 			    -e "s|@INITRD@|/live/initrd.img|g" \
 			    -e "s|@APPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
-			    -e "s|@APPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \
+			    -e "s|@APPEND_LIVE_FAILSAFE@|${LB_BOOTAPPEND_LIVE_FAILSAFE}|g" \
 			"${_TARGET}/live.cfg.in" >> "${_TARGET}/live.cfg"
 
 			rm -f "${_TARGET}/live.cfg.in"
@@ -250,7 +250,7 @@ then
 				       -e "s|@LINUX@|/live/vmlinuz${_NUMBER}|g" \
 				       -e "s|@INITRD@|/live/initrd${_NUMBER}.img|g" \
 				       -e "s|@APPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
-				       -e "s|@APPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \
+				       -e "s|@APPEND_LIVE_FAILSAFE@|${LB_BOOTAPPEND_LIVE_FAILSAFE}|g" \
 				"${_TARGET}/live.cfg"
 			done
 
@@ -260,7 +260,7 @@ then
 elif [ -e "${_TARGET}/live.cfg" ]
 then
 	sed -i  -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
-		-e "s|@LB_BOOTAPPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \
+		-e "s|@LB_BOOTAPPEND_LIVE_FAILSAFE@|${LB_BOOTAPPEND_LIVE_FAILSAFE}|g" \
 	${_TARGET}/live.cfg
 fi
 

share/bootloaders/extlinux/live.cfg.in

@@ -9,4 +9,4 @@ label live-@FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
 	linux @LINUX@
 	initrd @INITRD@
-	append @APPEND_LIVE@ @APPEND_FAILSAFE@
+	append @APPEND_LIVE_FAILSAFE@

share/bootloaders/isolinux/live.cfg.in

@@ -9,4 +9,4 @@ label live-@FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
 	linux @LINUX@
 	initrd @INITRD@
-	append @APPEND_LIVE@ @APPEND_FAILSAFE@
+	append @APPEND_LIVE_FAILSAFE@

share/bootloaders/pxelinux/live.cfg.in

@@ -9,4 +9,4 @@ label live-@FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
 	linux @LINUX@
 	initrd @INITRD@
-	append @APPEND_LIVE@ @APPEND_FAILSAFE@
+	append @APPEND_LIVE_FAILSAFE@

share/bootloaders/syslinux/live.cfg.in

@@ -9,4 +9,4 @@ label live-@FLAVOUR@-failsafe
 	menu label ^Live (@FLAVOUR@ failsafe)
 	linux @LINUX@
 	initrd @INITRD@
-	append @APPEND_LIVE@ @APPEND_FAILSAFE@
+	append @APPEND_LIVE_FAILSAFE@