summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2009-05-07 17:45:53 -0400
committerAdam Jackson <ajax@redhat.com>2009-05-07 17:45:53 -0400
commit80c9f86a4356616d9d9e551bb32bd9ad3429977b (patch)
tree99c5a6e7f9836830efcd50a7d5fe415f93d81d0c
parentbcf8a4f0b1de15feaf6ea46e497e8b3e8ea44417 (diff)
downloadanaconda-80c9f86a4356616d9d9e551bb32bd9ad3429977b.tar.gz
anaconda-80c9f86a4356616d9d9e551bb32bd9ad3429977b.tar.xz
anaconda-80c9f86a4356616d9d9e551bb32bd9ad3429977b.zip
Do nomodeset when doing xdriver=vesa
Otherwise things get a little iffy.
-rw-r--r--bootdisk/i386/options.msg2
-rw-r--r--bootdisk/i386/syslinux.cfg2
-rw-r--r--bootdisk/x86_64/options.msg2
-rw-r--r--bootdisk/x86_64/syslinux.cfg2
4 files changed, 4 insertions, 4 deletions
diff --git a/bootdisk/i386/options.msg b/bootdisk/i386/options.msg
index bd9bb87b1..8be6ab78b 100644
--- a/bootdisk/i386/options.msg
+++ b/bootdisk/i386/options.msg
@@ -17,7 +17,7 @@
- If you have an installer update disk, type: 01linux updates <ENTER>07.
- - If you have video driver problems, type: 01linux xdriver=vesa <ENTER>07.
+ - If you have video problems, type: 01linux xdriver=vesa nomodeset<ENTER>07.
- To test the memory in your system type: 01memtest86 <ENTER>07.
(This option is only available when booting from CD.)
diff --git a/bootdisk/i386/syslinux.cfg b/bootdisk/i386/syslinux.cfg
index a158a9a5e..06a651bea 100644
--- a/bootdisk/i386/syslinux.cfg
+++ b/bootdisk/i386/syslinux.cfg
@@ -28,7 +28,7 @@ label linux
label vesa
menu label Install system with ^basic video driver
kernel vmlinuz
- append initrd=initrd.img xdriver=vesa
+ append initrd=initrd.img xdriver=vesa nomodeset
label rescue
menu label ^Rescue installed system
kernel vmlinuz
diff --git a/bootdisk/x86_64/options.msg b/bootdisk/x86_64/options.msg
index bd9bb87b1..8be6ab78b 100644
--- a/bootdisk/x86_64/options.msg
+++ b/bootdisk/x86_64/options.msg
@@ -17,7 +17,7 @@
- If you have an installer update disk, type: 01linux updates <ENTER>07.
- - If you have video driver problems, type: 01linux xdriver=vesa <ENTER>07.
+ - If you have video problems, type: 01linux xdriver=vesa nomodeset<ENTER>07.
- To test the memory in your system type: 01memtest86 <ENTER>07.
(This option is only available when booting from CD.)
diff --git a/bootdisk/x86_64/syslinux.cfg b/bootdisk/x86_64/syslinux.cfg
index a158a9a5e..06a651bea 100644
--- a/bootdisk/x86_64/syslinux.cfg
+++ b/bootdisk/x86_64/syslinux.cfg
@@ -28,7 +28,7 @@ label linux
label vesa
menu label Install system with ^basic video driver
kernel vmlinuz
- append initrd=initrd.img xdriver=vesa
+ append initrd=initrd.img xdriver=vesa nomodeset
label rescue
menu label ^Rescue installed system
kernel vmlinuz