GeoIP: updated 05122012.

[people/pmueller/ipfire-2.x.git] / lfs / usb-stick

diff --git a/lfs/usb-stick b/lfs/usb-stick
index 427efe0de0b89114c9c547ffef5f08914d104da5..4c5e716b03871e19f8404337175f76a3af39eacb 100644 (file)
--- a/lfs/usb-stick
+++ b/lfs/usb-stick
@@ -44,15 +44,11 @@ md5 :
 ###############################################################################
 # Installation Details
 ###############################################################################
-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
+IMGfdd := /install/images/$(SNAME)-$(VERSION)-install-usb-fdd.$(MACHINE)-full-core$(CORE).img
+IMGhdd := /install/images/$(SNAME)-$(VERSION)-install-usb-hdd.$(MACHINE)-full-core$(CORE).img
 IMGfs  := /install/images/fs
 
-ifeq "$(ED)" "devel"
-       DISKSIZE=480000
-else
-       DISKSIZE=120000
-endif
+DISKSIZE=120000
 
 define COPY_TO_IMG
        mkdosfs -n IPFIRE -F 16 -I $$IMAGE && \
@@ -66,8 +62,8 @@ define COPY_TO_IMG
        losetup $$LOOPDEV $$IMAGE && \
        mount -t vfat $$LOOPDEV /install/mnt && \
        cp -fR /install/cdrom/* /install/mnt && \
-       mv /install/mnt/boot/isolinux/{instroot,vmlinuz,unattended.conf,splash.lss,*\.msg,memtest} /install/mnt && \
-       rm -rf /install/mnt/boot && \
+       mv /install/mnt/boot/isolinux/{instroot,vmlinuz,splash.lss,*\.msg,memtest} /install/mnt && \
+       rm -rf /install/mnt/boot/isolinux && \
        cp $(DIR_SRC)/config/syslinux/syslinux.cfg /install/mnt/syslinux.cfg && \
        umount /install/mnt && \
        losetup -d $$LOOPDEV && \