Domainkonfiguration neu gemacht.

USB-Stick Images hinzugefuegt.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@460 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/common/as86 b/config/rootfiles/common/as86
new file mode 100644 (file)
index 0000000..264eb89
--- /dev/null
+++ b/config/rootfiles/common/as86
@@ -0,0 +1,2 @@
+#usr/bin/as86
+#usr/bin/as86_encap

diff --git a/config/rootfiles/common/hwinfo b/config/rootfiles/common/hwinfo
new file mode 100644 (file)
index 0000000..1b778c6
--- /dev/null
+++ b/config/rootfiles/common/hwinfo
@@ -0,0 +1,16 @@
+#etc/init.d/hwscan
+#sbin/hwscan
+#sbin/hwscand
+#sbin/hwscanqueue
+#usr/include/hd.h
+#usr/lib/libhd_tiny.a
+#usr/sbin/check_hd
+#usr/sbin/convert_hd
+#usr/sbin/gen-hwcfg-disk.sh
+#usr/sbin/getsysinfo
+#usr/sbin/hwbootscan
+usr/sbin/hwinfo
+#usr/sbin/mk_isdnhwdb
+#usr/share/hwinfo
+#usr/share/hwinfo/ISDN.CDB.hwdb
+#usr/share/hwinfo/ISDN.CDB.txt

diff --git a/config/rootfiles/common/mbr b/config/rootfiles/common/mbr
new file mode 100644 (file)
index 0000000..29544b6
--- /dev/null
+++ b/config/rootfiles/common/mbr
@@ -0,0 +1,3 @@
+#usr/local/man/man8
+#usr/local/man/man8/install-mbr.8
+#usr/local/sbin/install-mbr

diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs
index 766591bff0f1f6074d6677f38c9d5f52a4ca94c6..43f5817159df6cbbcedfdf0d1f2c6ed1c985da2e 100644 (file)
--- a/config/rootfiles/common/misc-progs
+++ b/config/rootfiles/common/misc-progs
@@ -1,12 +1,7 @@
 usr/local/bin/extrahdctrl
 usr/local/bin/getipstat
-#usr/local/bin/installfcdsl
-#usr/local/bin/installpackage
 #usr/local/bin/iowrap
-usr/local/bin/ipfirebackup
-usr/local/bin/ipfirebkcfg
 usr/local/bin/ipfirereboot
-usr/local/bin/ipfirerscfg
 usr/local/bin/ipsecctrl
 usr/local/bin/launch-ether-wake
 usr/local/bin/logwatch

diff --git a/config/rootfiles/common/net-tools b/config/rootfiles/common/net-tools
index 52457df4309c4fbef4648c4b9d124dbdbe293bba..3cf72ac400dd22ec0d5745cd26b6c5ceed6e3a7d 100644 (file)
--- a/config/rootfiles/common/net-tools
+++ b/config/rootfiles/common/net-tools
@@ -1,5 +1,5 @@
 bin/dnsdomainname
-#bin/domainname
+bin/domainname
 bin/hostname
 bin/netstat
 #bin/nisdomainname

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index d3e1e7c13e5a0be2d3116e577fda7029ed6e606d..7b24da3dbc105d4e1a7f9ba82b3da7102318a378 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -4,8 +4,6 @@ bin/grep
 bin/pwd
 bin/stty
 #boot
-dev/null
-dev/console
 etc/bashrc
 etc/certparams
 etc/fstab
@@ -24,6 +22,7 @@ etc/nsswitch.conf
 #etc/opt
 etc/passwd
 etc/profile
+#etc/profile.d
 etc/profile.d/dircolors.sh
 etc/profile.d/extrapaths.sh
 etc/profile.d/readline.sh
@@ -43,8 +42,6 @@ mnt
 #root
 #sbin
 #srv
-#sys
-tmp
 #usr/bin/perl
 #usr/include
 #usr/lib
@@ -61,6 +58,7 @@ usr/local/bin/qosd
 usr/local/bin/readhash
 usr/local/bin/resetusb
 usr/local/bin/run-parts
+usr/local/bin/scanhd
 usr/local/bin/setddns.pl
 usr/local/bin/setreservedports
 usr/local/bin/settime

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 2c6601309dcd6afad9237d9f10e33010d67914a8..24854748dff5fdff0f61380950adcc16bd7b62a9 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -34,6 +34,7 @@
 * amavisd-new-2.4.1
 * applejuice-0.30
 * arping-2.05
+* as86-0.16.17
 * asterisk-1.4.0
 * autoconf-2.59
 * automake-1.9.6
@@ -161,6 +162,7 @@
 * make-3.80
 * man-db-2.4.3
 * man-pages-2.34
+* mbr-1.1.8
 * mc-4.6.1
 * memtest86+-1.65
 * misc-progs
@@ -225,6 +227,7 @@
 * sox-12.18.1
 * spandsp-0.0.3pre24
 * squashfs3.2-r2
+* squid-2.6.STABLE12
 * squid-2.6.STABLE9
 * squid-graph-3.2
 * squidGuard-1.2.0

diff --git a/lfs/as86 b/lfs/as86
index 53e188a5b0716ef9af476f6f2c6c57530b6ce5ff..17377c3ba65ba94ed51c59ea8c0e4328e20cb094 100644 (file)
--- a/lfs/as86
+++ b/lfs/as86
@@ -72,7 +72,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/mbr b/lfs/mbr
index cc0394d3cff03ac2d08a4b222e5fc896db62cace..72265572cc51b5e83c2f32ae25b03ee140e81295 100644 (file)
--- a/lfs/mbr
+++ b/lfs/mbr
@@ -35,7 +35,7 @@ VER        = 1.1.8
 
 THISAPP    = mbr-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.chiark.greenend.org.uk/~neilt/mbr
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/usb-stick b/lfs/usb-stick
new file mode 100644 (file)
index 0000000..a15cde0
--- /dev/null
+++ b/lfs/usb-stick
@@ -0,0 +1,98 @@
+###############################################################################
+# This file is part of the IPCop Firewall.                                    #
+#                                                                             #
+# IPCop 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           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IPCop 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>                        #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+THISAPP    = usb-stick
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+install : $(TARGET)
+
+check :
+
+download :
+
+md5 :
+
+###############################################################################
+# Installation Details
+###############################################################################
+IMGfdd := /install/images/$(SNAME)-$(VERSION)-install-usb-fdd.$(MACHINE).img
+IMGhdd := /install/images/$(SNAME)-$(VERSION)-install-usb-hdd.$(MACHINE).img
+IMGfs  := /install/images/fs
+
+define COPY_TO_IMG
+       mkdosfs -n IPFIRE -F 16 -I $$IMAGE && \
+       for i in `seq 0 7`; do \
+               if (! losetup /dev/loop$${i} >/dev/null 2>&1 ); then \
+                       LOOPDEV="/dev/loop$${i}"; \
+                       break; \
+               fi; \
+       done; \
+       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 && \
+       umount /install/mnt && \
+       losetup -d $$LOOPDEV && \
+       syslinux $$IMAGE
+endef
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+
+       # usb-fdd superfloppy (partitionless)
+       # compute size +32 blocks for bootsector/fat/etc...
+       dd bs=1024 count=$$((`du -k -s /install/cdrom | awk '{print $$1}'` + 2048 )) \
+               if=/dev/zero \
+               of=$(IMGfdd)
+       IMAGE=$(IMGfdd); $(COPY_TO_IMG)
+
+       # 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
+       IMAGE=$(IMGfs); $(COPY_TO_IMG)
+       
+       # usb-hdd (64 heads, 32 sectors geometry, on a partition 1)
+       # use 64 heads as 256 does not work on Award bios (Asus A7V8X-X Gilles)
+       # use 32 sectors a minima or device is not recognised as hard disk (Frank)
+       # add 32 to IMGfs as first partition start at 32
+       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)
+       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
+
+       gzip -f9 $(IMGfdd) $(IMGhdd)
+       rm -rf $$LFS/tmp/* $(IMGfs)

diff --git a/make.sh b/make.sh
index 1caee37f295e93334fd0c37a9b8a3398b181c85e..02fea669ab5d5c6b973726eabcb324c61074b378 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -540,6 +540,8 @@ buildinstaller() {
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
   ipfiremake syslinux
+  ipfiremake as86
+  ipfiremake mbr
   ipfiremake memtest
   installmake linux-libc-header
   installmake binutils
@@ -609,8 +611,13 @@ buildpackages() {
                ipfiremake cdrom ED=$i
        fi
   done
+  
+  # Check if there is a loop device for building in virtual environments
+  if [ -e /dev/loop0 ]; then
+       ipfiremake usb-stick
+  fi
   ipfiremake pxe
-  cp -f $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
+  mv $LFS/install/images/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1
 
 #  ipfirepackages
 
@@ -633,7 +640,6 @@ buildpackages() {
   echo -n "###EOF###" >> $BASEDIR/packages/packages_list.txt
 
   cd $PWD
-
 }
 
 ipfirepackages() {

diff --git a/src/initscripts/init.d/localnet b/src/initscripts/init.d/localnet
index 91c9e1f4d702eff742eff3500f1faa63739d73c4..c1e5b2933c339ca19512172d6e5079fae75349ee 100644 (file)
--- a/src/initscripts/init.d/localnet
+++ b/src/initscripts/init.d/localnet
@@ -24,12 +24,14 @@ case "${1}" in
                evaluate_retval
 
                boot_mesg "Setting hostname to ${HOSTNAME}..."
+               hostname ${HOSTNAME}
+               evaluate_retval
+
                if [ -z "$DOMAINNAME" ]; then
-                       hostname ${HOSTNAME}
-               else
-                       hostname ${HOSTNAME}.${DOMAINNAME}
+                       boot_mesg "Setting domainname to ${DOMAINNAME}..."
+                       domainname ${DOMAINNAME}
+                       evaluate_retval
                fi
-               evaluate_retval
                ;;
 
        stop)