X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fusb-stick;h=76b97024fcebec6685f5c0b4c706ecd64c0fa8e4;hp=6a62e271903e90d7e30a156ecfc14f0b8640d123;hb=f7ef9f2d27c9d95f27bb68549d6c72530ce8702b;hpb=0abbeef660268fce091cbf147cff0400f2a9745f diff --git a/lfs/usb-stick b/lfs/usb-stick index 6a62e27190..76b97024fc 100644 --- a/lfs/usb-stick +++ b/lfs/usb-stick @@ -44,10 +44,16 @@ 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 /0 `seq 0 7`; do \ @@ -80,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)