diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-02-17 00:59:41 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-02-17 00:59:41 +0000 |
| commit | dd432e2ca685e68c71bfb6f3ef6e08811c41df50 (patch) | |
| tree | 065c368042bdc78587683514d799ecf42ccb3c9f /target/linux/x86/image/menu.lst | |
| parent | 17cfd09a8f05c78d854a75a4c2b7c7cb0b28be78 (diff) | |
| download | upstream-dd432e2ca685e68c71bfb6f3ef6e08811c41df50.tar.gz upstream-dd432e2ca685e68c71bfb6f3ef6e08811c41df50.tar.bz2 upstream-dd432e2ca685e68c71bfb6f3ef6e08811c41df50.zip | |
[x86]
- clean up menu.lst template
- make grub usage of vt0 selectable in menuconfig
- choose appropriate default baudrate for soekris devices
- fix generation of grub menu for iso images
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19681 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86/image/menu.lst')
| -rw-r--r-- | target/linux/x86/image/menu.lst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/x86/image/menu.lst b/target/linux/x86/image/menu.lst index e09177c96e..5f99f21560 100644 --- a/target/linux/x86/image/menu.lst +++ b/target/linux/x86/image/menu.lst @@ -1,15 +1,15 @@ -serial --unit=0 --speed=@BAUDRATE@ --word=8 --parity=no --stop=1 -terminal --timeout=2 console serial +@SERIAL_CONFIG@ +@TERMINAL_CONFIG@ default 0 timeout 5 title OpenWrt root (hd0,0) -kernel /boot/vmlinuz @CMDLINE@ noinitrd console=tty0 console=@CONSOLE@,@BAUDRATE@n8 reboot=bios +kernel /boot/vmlinuz @CMDLINE@ noinitrd reboot=bios boot title OpenWrt (failsafe) root (hd0,0) -kernel /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd console=tty0 console=@CONSOLE@,@BAUDRATE@n8 reboot=bios +kernel /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd reboot=bios boot |