Merge remote-tracking branch 'stevee/axel-log-fix' into axel-fixperms

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

diff --git a/lfs/usb-stick b/lfs/usb-stick
index acfa409395b45a93b88d7a17e10dbce06ff3c7bf..30a14757741186ee3c3eaa575ff552a2df14f97c 100644 (file)
--- a/lfs/usb-stick
+++ b/lfs/usb-stick
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2012  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,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 && \
@@ -96,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