X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/5d840152c87296251edeb1020924e9037060a0e3..ecfdcd7b1783df2e93bd2557823764b408719349:/target/linux/x86/image/Makefile

diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index 2bdfba5d0..6d3c77b77 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -16,19 +16,19 @@ ROOTPART=$(strip $(subst ",, $(CONFIG_X86_GRUB_ROOTPART)))
 ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
 ifneq ($(HOST_OS),Darwin)
   define Image/cmdline/squashfs
-    block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs init=/etc/preinit
+    block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs
   endef
 
   define Image/cmdline/jffs2-64k
-    block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=jffs2 init=/etc/preinit
+    block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=jffs2
   endef
 
   define Image/cmdline/jffs2-128k
-    block2mtd.block2mtd=$(ROOTPART),131072,rootfs root=/dev/mtdblock0 rootfstype=jffs2 init=/etc/preinit
+    block2mtd.block2mtd=$(ROOTPART),131072,rootfs root=/dev/mtdblock0 rootfstype=jffs2
   endef
 
   define Image/cmdline/ext2
-    root=$(ROOTPART) rootfstype=ext2 init=/etc/preinit
+    root=$(ROOTPART) rootfstype=ext2
   endef
   
   define Image/Build/grub
@@ -92,14 +92,15 @@ define Image/Build/squashfs
 endef
 
 define Image/Build/iso 
+	$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub
 	$(CP) \
 		$(STAGING_DIR_HOST)/usr/lib/grub/i386-openwrt/stage2_eltorito \
 		$(KDIR)/root.grub/boot/grub/stage2_eltorito 
-	sed -i \
+	sed \
 		-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \
 		-e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \
 		-e 's#(hd0,0)#(cd)#g' \
-		 $(KDIR)/root.grub/boot/grub/menu.lst 
+		./menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst
 	$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz 
 	mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table \
 		-o $(KDIR)/root.iso $(KDIR)/root.grub 
@@ -111,9 +112,11 @@ endef
 
 define Image/Build
 	$(call Image/Build/$(1))
+ifneq ($(1),iso)
 	$(call Image/Build/grub,$(1))
 	$(call Image/Build/vdi,$(1))
 	$(call Image/Build/vmdk,$(1))
+endif
 	$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1).fs
 	$(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-vmlinuz
 endef