[SCM] live-helper branch, debian-next, updated. debian/2.0_a15-1-8-ga9a95f6

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit a9a95f634c9e48410558734fd474bfebbb614f4c
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jun 22 22:38:45 2010 +0200

    Adding nomodeset to failsafe parameters to disable kms.

diff --git a/helpers/binary_grub b/helpers/binary_grub
index 40a3443..6510680 100755
--- a/helpers/binary_grub
+++ b/helpers/binary_grub
@@ -214,7 +214,7 @@ fi
 LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
 
 # Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
+FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal"
 
 # Assembling kernel configuration
 
diff --git a/helpers/binary_grub2 b/helpers/binary_grub2
index 2afae22..7fa8f3a 100755
--- a/helpers/binary_grub2
+++ b/helpers/binary_grub2
@@ -188,7 +188,7 @@ fi
 LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
 
 # Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
+FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal"
 
 # Assembling kernel configuration
 
diff --git a/helpers/binary_silo b/helpers/binary_silo
index ab8dd87..c3f8b06 100755
--- a/helpers/binary_silo
+++ b/helpers/binary_silo
@@ -181,7 +181,7 @@ fi
 LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
 
 # Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=ofonly"
+FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=ofonly"
 
 # Assembling kernel configuration
 
diff --git a/helpers/binary_syslinux b/helpers/binary_syslinux
index af7e9cd..2553195 100755
--- a/helpers/binary_syslinux
+++ b/helpers/binary_syslinux
@@ -503,7 +503,7 @@ fi
 LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
 
 # Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
+FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal"
 
 # Moving kernels into place
 if [ "binary/${INITFS}" != "${KERNEL_PATH}" ]
diff --git a/helpers/binary_yaboot b/helpers/binary_yaboot
index 148424e..b660f5f 100755
--- a/helpers/binary_yaboot
+++ b/helpers/binary_yaboot
@@ -220,7 +220,7 @@ fi
 LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
 
 # Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=ofonly"
+FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=ofonly"
 
 # Assembling kernel configuration
 

-- 
live-helper