From 27baec04a1d707d5b6229509c66630bd6864a704 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 9 Oct 2007 16:57:12 +0000 Subject: move grub menu.lst to the right place SVN-Revision: 9216 --- target/linux/x86/image/Makefile | 2 +- target/linux/x86/image/menu.lst | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 target/linux/x86/image/menu.lst (limited to 'target/linux/x86/image') diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 095d402..dd147b8 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 0000000..cb306cc --- /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 -- cgit v1.1