X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Fimage%2Fx86%2FMakefile;h=fd424ffd0046d8062a1d951a48c77a0725b4b2d2;hb=f2a27506520f0e010b3b3325a8a940d3d3257351;hp=b836f3ace6f20a4e3635b8a5b361f2c4ae2e16e0;hpb=5cd5287c63bd0be72b4ae00fc1af508a2b42e541;p=openwrt-10.03%2F.git

diff --git a/target/image/x86/Makefile b/target/image/x86/Makefile
index b836f3ace..fd424ffd0 100644
--- a/target/image/x86/Makefile
+++ b/target/image/x86/Makefile
@@ -17,19 +17,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=$(CONFIG_X86_GRUB_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=$(CONFIG_X86_GRUB_ROOTPART),131072 root=/dev/mtdblock0 rootfstype=jffs2
   endef
 
   define Image/cmdline/ext2
-    root=/dev/hda2 rootfstype=ext2
+    root=$(CONFIG_X86_GRUB_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 \
@@ -40,7 +40,7 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
 		-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)))#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_X86_GRUB_FSPART) $(KDIR)/root.$(1)
+	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)
   endef
 endif