aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86-2.6/image
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-03-06 19:13:40 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-03-06 19:13:40 +0000
commit2b35413971fea49a7af6d0f2d0a05796a6960d15 (patch)
tree0961ccf3a4053a6ee4bb704acc44fe992b7201c5 /target/linux/x86-2.6/image
parent4fa953e600238e6afd912400d57bb4cca6eb2136 (diff)
downloadupstream-2b35413971fea49a7af6d0f2d0a05796a6960d15.tar.gz
upstream-2b35413971fea49a7af6d0f2d0a05796a6960d15.tar.bz2
upstream-2b35413971fea49a7af6d0f2d0a05796a6960d15.zip
add vga console support for x86-2.6 images (fixes #1342, #840)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6530 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86-2.6/image')
-rw-r--r--target/linux/x86-2.6/image/grub/menu.lst6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/x86-2.6/image/grub/menu.lst b/target/linux/x86-2.6/image/grub/menu.lst
index f9d28438f8..f7543bda42 100644
--- a/target/linux/x86-2.6/image/grub/menu.lst
+++ b/target/linux/x86-2.6/image/grub/menu.lst
@@ -1,15 +1,15 @@
serial --unit=0 --speed=@BAUDRATE@ --word=8 --parity=no --stop=1
-terminal --timeout=10 serial
+terminal --timeout=10 console serial
default 0
timeout 5
title OpenWrt
root (hd0,0)
-kernel /boot/vmlinuz @CMDLINE@ noinitrd console=ttyS0,@BAUDRATE@n8 reboot=bios
+kernel /boot/vmlinuz @CMDLINE@ noinitrd console=tty0 console=ttyS0,@BAUDRATE@n8 reboot=bios
boot
title OpenWrt (failsafe)
root (hd0,0)
-kernel /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd console=ttyS0,@BAUDRATE@n8 reboot=bios
+kernel /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd console=tty0 console=ttyS0,@BAUDRATE@n8 reboot=bios
boot