Again allow all IP's on loopback.

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

diff --git a/lfs/usb-stick b/lfs/usb-stick
index 29486103b5c412b1d0d613f94054e40c0dadee20..acfa409395b45a93b88d7a17e10dbce06ff3c7bf 100644 (file)
--- a/lfs/usb-stick
+++ b/lfs/usb-stick
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -44,8 +44,8 @@ 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"
@@ -66,8 +66,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,*\.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 && \