aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-02-28 01:10:10 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-02-28 01:10:10 +0000
commitcb3fc42f719371f93af370920b43c61955490f01 (patch)
tree9f0ac78ca1ae36fa44fe3c48eb57de8f8af249ec
parentd0640800134ae6fd56931cf9cf770ea7d1f98e62 (diff)
downloadupstream-cb3fc42f719371f93af370920b43c61955490f01.tar.gz
upstream-cb3fc42f719371f93af370920b43c61955490f01.tar.bz2
upstream-cb3fc42f719371f93af370920b43c61955490f01.zip
strip double quotes from grub boot options (fixes #1406)
SVN-Revision: 6419
-rw-r--r--target/linux/x86-2.6/image/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/target/linux/x86-2.6/image/Makefile b/target/linux/x86-2.6/image/Makefile
index bb7d171faf..955a42b23c 100644
--- a/target/linux/x86-2.6/image/Makefile
+++ b/target/linux/x86-2.6/image/Makefile
@@ -8,8 +8,9 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
export PATH=$(TARGET_PATH):/sbin
+BOOTOPTS=$(strip $(subst ",, $(CONFIG_X86_GRUB_BOOTOPTS)))
ROOTPART=$(strip $(subst ",, $(CONFIG_X86_GRUB_ROOTPART)))
-#")) # fix vim's broken syntax highlighting
+#"))")) # fix vim's broken syntax highlighting
ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
@@ -41,7 +42,7 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
$(KDIR)/root.grub/boot/grub/
$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
sed \
- -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(CONFIG_X86_GRUB_BOOTOPTS)#g' \
+ -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
PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" 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)