summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-06-22 22:38:45 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:11 +0100
commit3558eb0286c0d273721db3f93d334ca614e98b24 (patch)
tree46c690d737f5e2a42febd9bc08455dbae3883584
parent4bdc9149e62a3395e0bdd48b029a69678dd72c53 (diff)
downloadvyos-live-build-3558eb0286c0d273721db3f93d334ca614e98b24.tar.gz
vyos-live-build-3558eb0286c0d273721db3f93d334ca614e98b24.zip
Adding nomodeset to failsafe parameters to disable kms.
-rwxr-xr-xhelpers/binary_grub2
-rwxr-xr-xhelpers/binary_grub22
-rwxr-xr-xhelpers/binary_silo2
-rwxr-xr-xhelpers/binary_syslinux2
-rwxr-xr-xhelpers/binary_yaboot2
5 files changed, 5 insertions, 5 deletions
diff --git a/helpers/binary_grub b/helpers/binary_grub
index 40a34436f..651068010 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 2afae224f..7fa8f3abe 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 ab8dd870b..c3f8b06f9 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 af7e9cd8b..25531956c 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 148424e36..b660f5f19 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