aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-10-09 16:57:12 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-10-09 16:57:12 +0000
commit6c533f0b92c7f57ab4764f80a6e1f20cc5c377ec (patch)
treee7ad935c527bb0df8db075d9ee2f1b659d263baf /target/linux/x86
parentd0d5681221b84461181090c5332a24080fa37558 (diff)
downloadmaster-187ad058-6c533f0b92c7f57ab4764f80a6e1f20cc5c377ec.tar.gz
master-187ad058-6c533f0b92c7f57ab4764f80a6e1f20cc5c377ec.tar.bz2
master-187ad058-6c533f0b92c7f57ab4764f80a6e1f20cc5c377ec.zip
move grub menu.lst to the right place
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9216 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86')
-rw-r--r--target/linux/x86/image/Makefile2
-rw-r--r--target/linux/x86/image/menu.lst15
2 files changed, 16 insertions, 1 deletions
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index 095d40240b..dd147b869a 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -40,7 +40,7 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
sed \
-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \
-e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \
- ./grub/menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst
+ ./menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst
PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
$(call Image/Build/grub/$(1))
endef
diff --git a/target/linux/x86/image/menu.lst b/target/linux/x86/image/menu.lst
new file mode 100644
index 0000000000..cb306cc443
--- /dev/null
+++ b/target/linux/x86/image/menu.lst
@@ -0,0 +1,15 @@
+serial --unit=0 --speed=@BAUDRATE@ --word=8 --parity=no --stop=1
+terminal --timeout=2 console serial
+
+default 0
+timeout 5
+
+title OpenWrt
+root (hd0,0)
+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=tty0 console=ttyS0,@BAUDRATE@n8 reboot=bios
+boot