X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/58c8f8ef5a038b47e39f7b8c9662493f4cde1317..a53693f2f5dc5fea6eac79a71d7c7fb9002f49b7:/target/image/x86/Makefile

diff --git a/target/image/x86/Makefile b/target/image/x86/Makefile
index 8c0cde440..adace07dc 100644
--- a/target/image/x86/Makefile
+++ b/target/image/x86/Makefile
@@ -7,6 +7,10 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
+ROOTPART=$(strip $(subst ",, $(CONFIG_X86_GRUB_ROOTPART)))
+#")) # fix vim's broken syntax highlighting
+
+
 ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
   define Build/Compile
 	$(MAKE) -C grub compile
@@ -17,19 +21,19 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
   endef
 
   define Image/cmdline/jffs2-64k
-    block2mtd.block2mtd=/dev/hda2,65536 root=/dev/mtdblock0 rootfstype=jffs2
+    block2mtd.block2mtd=$(ROOTPART),65536 root=/dev/mtdblock0 rootfstype=jffs2
   endef
 
   define Image/cmdline/jffs2-128k
-    block2mtd.block2mtd=/dev/hda2,131072 root=/dev/mtdblock0 rootfstype=jffs2
+    block2mtd.block2mtd=$(ROOTPART),131072 root=/dev/mtdblock0 rootfstype=jffs2
   endef
 
   define Image/cmdline/ext2
-    root=$(CONFIG_X86_GRUB_ROOTPART) rootfstype=ext2 $(CONFIG_X86_GRUB_BOOTOPTS)
+    root=$(ROOTPART) rootfstype=ext2 $(CONFIG_X86_GRUB_BOOTOPTS)
   endef
 
   define Image/Build/grub
-  	mkdir -p $(KDIR)/root.grub/boot/grub
+	mkdir -p $(KDIR)/root.grub/boot/grub
 	$(CP) \
 		$(STAGING_DIR)/usr/lib/grub/i386-pc/stage1 \
 		$(STAGING_DIR)/usr/lib/grub/i386-pc/stage2 \