aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-01-07 16:13:39 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-01-07 16:13:39 +0000
commit36f961d406f77d8cadaf4817fc9f45a710fab0b8 (patch)
treebe12b4ab42ebb43eabfc6592d83bdf86cd38b255
parent395eedf86abf4748934bddb55f6b33a4ff52704a (diff)
downloadupstream-36f961d406f77d8cadaf4817fc9f45a710fab0b8.tar.gz
upstream-36f961d406f77d8cadaf4817fc9f45a710fab0b8.tar.bz2
upstream-36f961d406f77d8cadaf4817fc9f45a710fab0b8.zip
fix grub bootopts (#1145)
SVN-Revision: 6019
-rw-r--r--target/linux/x86-2.6/image/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/x86-2.6/image/Makefile b/target/linux/x86-2.6/image/Makefile
index 7e76523d91..e1425676dd 100644
--- a/target/linux/x86-2.6/image/Makefile
+++ b/target/linux/x86-2.6/image/Makefile
@@ -30,7 +30,7 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
endef
define Image/cmdline/ext2
- root=$(ROOTPART) rootfstype=ext2 $(CONFIG_X86_GRUB_BOOTOPTS)
+ root=$(ROOTPART) rootfstype=ext2
endef
define Image/Build/grub
@@ -42,7 +42,7 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
$(KDIR)/root.grub/boot/grub/
$(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/root.grub/boot/vmlinuz
sed \
- -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)))#g' \
+ -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(CONFIG_X86_GRUB_BOOTOPTS)#g' \
-e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \
./grub/menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst
PATH="$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/bin:$(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)