From 0cd87a99dbec9bbb223370f2f867b59590975ef0 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 15 Jul 2009 09:56:53 +0000
Subject: alpine.mk: use mtools to grate usb image

---
 alpine.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'alpine.mk')

diff --git a/alpine.mk b/alpine.mk
index 031c584..2be7328 100755
--- a/alpine.mk
+++ b/alpine.mk
@@ -234,10 +234,12 @@ MBRPATH 	:= /usr/share/syslinux/mbr.bin
 
 $(USBIMG): $(ISOFS_DIRSTAMP)
 	@echo "==> Generating $@"
-	@dd if=/dev/zero of=$(USBIMG) bs=1024 count=$(USBIMG_SIZE)
-	@mkfs.vfat $(USBIMG) >/dev/null
+	@mformat -C -v 'ALPINE' -c 16 -h 64 -n 32 -i $(USBIMG) \
+		-t $$(($(USBIMG_SIZE) / 1200)) ::
 	@syslinux $(USBIMG)
-	@MTOOLS_SKIP_CHECK=1 mcopy -i $(USBIMG) $(ISO_DIR)/* $(ISO_DIR)/.[a-z]* ::
+	@mcopy -i $(USBIMG) $(ISO_DIR)/* $(ISO_DIR)/.[a-z]* ::
+	@mcopy -i $(USBIMG) /dev/zero ::/zero 2>/dev/null || true
+	@mdel -i $(USBIMG) ::/zero
 
 USBIMG_SHA1	:= $(USBIMG).sha1
 $(USBIMG_SHA1):	$(USBIMG)
-- 
cgit v1.2.3-70-g09d2