X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fusb-stick;h=76b97024fcebec6685f5c0b4c706ecd64c0fa8e4;hp=c68ba137a28f13e84eeae91ef08f2ea90ab8a239;hb=6c49789edb5d4c24d679fc5e47aed4ac5470b1bf;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be

diff --git a/lfs/usb-stick b/lfs/usb-stick
index c68ba137a2..76b97024fc 100644
--- a/lfs/usb-stick
+++ b/lfs/usb-stick
@@ -44,13 +44,20 @@ md5 :
 ###############################################################################
 # Installation Details
 ###############################################################################
-IMGfdd := /install/images/$(SNAME)-$(VERSION)-install-usb-fdd.$(MACHINE).img
-IMGhdd := /install/images/$(SNAME)-$(VERSION)-install-usb-hdd.$(MACHINE).img
+IMGfdd := /install/images/$(SNAME)-$(VERSION)-install-usb-fdd.$(MACHINE)-$(ED)-core$(CORE).img
+IMGhdd := /install/images/$(SNAME)-$(VERSION)-install-usb-hdd.$(MACHINE)-$(ED)-core$(CORE).img
 IMGfs  := /install/images/fs
 
+ifeq "$(ED)" "devel"
+	DISKSIZE=480000
+else
+	DISKSIZE=120000
+endif
+
 define COPY_TO_IMG
 	mkdosfs -n IPFIRE -F 16 -I $$IMAGE && \
-	for i in `seq 0 7`; do \
+	for i in /0 `seq 0 7`; do \
+		[ -e /dev/loop$${i} ] || continue; \
 		if (! losetup /dev/loop$${i} >/dev/null 2>&1 ); then \
 			LOOPDEV="/dev/loop$${i}"; \
 			break; \
@@ -79,7 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Partitionned images : make a file system bigger than iso size
 	# that fit on 128MB key to let free space available
 	# on the unique partition. Image will be compressed later
-	dd bs=1k if=/dev/zero of=$(IMGfs) count=120000
+	dd bs=1k if=/dev/zero of=$(IMGfs) count=$(DISKSIZE)
 	IMAGE=$(IMGfs); $(COPY_TO_IMG)
 	
 	# usb-hdd (64 heads, 32 sectors geometry, on a partition 1)