X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fusb-stick;h=29486103b5c412b1d0d613f94054e40c0dadee20;hb=d0515b01f7ced53d877109d1ad7fb5edac78cda2;hp=3f863b11a5ab500f2185dc8aea8d7304e268c168;hpb=eedc26d9513bfccac956100cb32f81424e7b85fb;p=people%2Fpmueller%2Fipfire-2.x.git diff --git a/lfs/usb-stick b/lfs/usb-stick index 3f863b11a5..29486103b5 100644 --- a/lfs/usb-stick +++ b/lfs/usb-stick @@ -48,9 +48,16 @@ IMGfdd := /install/images/$(SNAME)-$(VERSION)-install-usb-fdd.$(MACHINE).img IMGhdd := /install/images/$(SNAME)-$(VERSION)-install-usb-hdd.$(MACHINE).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 /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)