[SCM] live-build branch, debian, updated. debian/3.0_a46-1-21-g4b333fb

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 1361d324e1c96c09b8496b1d01cdb7f54e7abeaa
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Apr 21 10:45:50 2012 +0200

    Adding memtest to the list of options appended in fail-safe mode.

diff --git a/scripts/build/lb_binary_grub b/scripts/build/lb_binary_grub
index 70be63c..ca52032 100755
--- a/scripts/build/lb_binary_grub
+++ b/scripts/build/lb_binary_grub
@@ -183,7 +183,7 @@ fi
 LB_BOOTAPPEND_LIVE="$(echo ${LB_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
 
 # Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal"
+FAILSAFE="memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal"
 
 # Assembling kernel configuration
 
diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/lb_binary_grub2
index b52e14c..3021fd1 100755
--- a/scripts/build/lb_binary_grub2
+++ b/scripts/build/lb_binary_grub2
@@ -157,7 +157,7 @@ fi
 LB_BOOTAPPEND_LIVE="$(echo ${LB_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
 
 # Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal"
+FAILSAFE="memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal"
 
 # Assembling kernel configuration
 
diff --git a/scripts/build/lb_binary_silo b/scripts/build/lb_binary_silo
index abbbb2c..05f35d6 100755
--- a/scripts/build/lb_binary_silo
+++ b/scripts/build/lb_binary_silo
@@ -147,7 +147,7 @@ fi
 LB_BOOTAPPEND_LIVE="$(echo ${LB_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
 
 # Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=ofonly"
+FAILSAFE="memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=ofonly"
 
 # Assembling kernel configuration
 
diff --git a/scripts/build/lb_binary_yaboot b/scripts/build/lb_binary_yaboot
index b2f5b23..ff706ce 100755
--- a/scripts/build/lb_binary_yaboot
+++ b/scripts/build/lb_binary_yaboot
@@ -189,7 +189,7 @@ fi
 LB_BOOTAPPEND_LIVE="$(echo ${LB_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
 
 # Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=ofonly"
+FAILSAFE="memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=ofonly"
 
 # Assembling kernel configuration
 

-- 
live-build