X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fusb-stick;h=1bfc8a167e2c934b66a92dee8a7c8b997908a8a1;hp=a15cde00905a090d5c367c0d03474179f1a55157;hb=5aef2fe3bd622d89ff8473a18099da6c1fa8c3fe;hpb=4dc82852da32dfd0dc5fbdbff16f0c4f38aea1a5

diff --git a/lfs/usb-stick b/lfs/usb-stick
index a15cde009..1bfc8a167 100644
--- a/lfs/usb-stick
+++ b/lfs/usb-stick
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2013  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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,6 +24,8 @@
 
 include Config
 
+VER = ipfire
+
 THISAPP    = usb-stick
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -44,13 +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)-full-core$(CORE).img
+IMGhdd := /install/images/$(SNAME)-$(VERSION)-install-usb-hdd.$(MACHINE)-full-core$(CORE).img
 IMGfs  := /install/images/fs
 
+DISKSIZE=120000
+
 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; \
@@ -59,9 +62,9 @@ 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 && \
-	cp $(DIR_SRC)/config/syslinux/syslinux.cfg /install/mnt/syslinux.cfg && \
+	mv /install/mnt/boot/isolinux /install/mnt/boot/syslinux && \
+	mv /install/mnt/boot/syslinux/isolinux.cfg \
+	   /install/mnt/boot/syslinux/syslinux.cfg && \
 	umount /install/mnt && \
 	losetup -d $$LOOPDEV && \
 	syslinux $$IMAGE
@@ -79,7 +82,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)
@@ -89,7 +92,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	COUNT=$$((`du -k -s $(IMGfs) | awk '{print $$1}'` + 32 )); \
 	dd bs=1k if=/dev/zero of=$(IMGhdd) count=$$COUNT
 	# write mbr before partitioning save a 'not msdos fs' warning from sfdisk
-	/usr/local/sbin/install-mbr -f $(IMGhdd)
+	/usr/sbin/install-mbr -f $(IMGhdd)
 	echo -e "0,,6,*\n;\n;\n;" | sfdisk -qLD -H 64 -S 32 $(IMGhdd)
 	# copy the entire partition, make the fs and dd back
 	dd if=$(IMGfs) of=$(IMGhdd) bs=512 seek=32