Bootscripte an den IPFire angepasst.

Ramdisk bearbeitet und Diskettenimages entfernt.
PCMCIA-Utils entfernt.

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

diff --git a/config/rootfiles/common/openswan b/config/rootfiles/common/openswan
new file mode 100644 (file)
index 0000000..e5413ea
--- /dev/null
+++ b/config/rootfiles/common/openswan
@@ -0,0 +1,303 @@
+etc/ipsec.conf
+#etc/ipsec.d
+#etc/ipsec.d/aacerts
+#etc/ipsec.d/cacerts
+#etc/ipsec.d/certs
+#etc/ipsec.d/crls
+#etc/ipsec.d/examples
+#etc/ipsec.d/examples/l2tp-cert-orgWIN2KXP.conf
+#etc/ipsec.d/examples/l2tp-cert.conf
+#etc/ipsec.d/examples/l2tp-psk-orgWIN2KXP.conf
+#etc/ipsec.d/examples/l2tp-psk.conf
+#etc/ipsec.d/examples/linux-linux.conf
+#etc/ipsec.d/examples/no_oe.conf
+#etc/ipsec.d/ocspcerts
+#etc/ipsec.d/policies
+#etc/ipsec.d/policies/block
+#etc/ipsec.d/policies/clear
+#etc/ipsec.d/policies/clear-or-private
+#etc/ipsec.d/policies/private
+#etc/ipsec.d/policies/private-or-clear
+#etc/ipsec.d/private
+etc/ipsec.secrets
+#etc/rc.d/init.d/ipsec
+#etc/rc.d/rc0.d/K76ipsec
+#etc/rc.d/rc1.d
+#etc/rc.d/rc1.d/K76ipsec
+#etc/rc.d/rc2.d
+#etc/rc.d/rc2.d/S47ipsec
+#etc/rc.d/rc3.d/S47ipsec
+#etc/rc.d/rc4.d
+#etc/rc.d/rc4.d/S47ipsec
+#etc/rc.d/rc5.d
+#etc/rc.d/rc5.d/S47ipsec
+#etc/rc.d/rc6.d/K76ipsec
+usr/lib/ipsec
+#usr/lib/ipsec/_confread
+#usr/lib/ipsec/_copyright
+#usr/lib/ipsec/_include
+#usr/lib/ipsec/_keycensor
+#usr/lib/ipsec/_plutoload
+#usr/lib/ipsec/_plutorun
+#usr/lib/ipsec/_realsetup
+#usr/lib/ipsec/_secretcensor
+#usr/lib/ipsec/_startklips
+#usr/lib/ipsec/_updown
+#usr/lib/ipsec/_updown_x509
+usr/libexec/ipsec
+#usr/libexec/ipsec/_pluto_adns
+#usr/libexec/ipsec/auto
+#usr/libexec/ipsec/barf
+#usr/libexec/ipsec/calcgoo
+#usr/libexec/ipsec/eroute
+#usr/libexec/ipsec/ikeping
+#usr/libexec/ipsec/klipsdebug
+#usr/libexec/ipsec/livetest
+#usr/libexec/ipsec/look
+#usr/libexec/ipsec/mailkey
+#usr/libexec/ipsec/manual
+#usr/libexec/ipsec/newhostkey
+#usr/libexec/ipsec/pf_key
+#usr/libexec/ipsec/pluto
+#usr/libexec/ipsec/ranbits
+#usr/libexec/ipsec/rsasigkey
+#usr/libexec/ipsec/secrets
+#usr/libexec/ipsec/setup
+#usr/libexec/ipsec/showdefaults
+#usr/libexec/ipsec/showhostkey
+#usr/libexec/ipsec/spi
+#usr/libexec/ipsec/spigrp
+#usr/libexec/ipsec/tncfg
+#usr/libexec/ipsec/verify
+#usr/libexec/ipsec/whack
+#usr/man/man3/ipsec_addrbytesof.3
+#usr/man/man3/ipsec_addrbytesptr.3
+#usr/man/man3/ipsec_addrcmp.3
+#usr/man/man3/ipsec_addrinsubnet.3
+#usr/man/man3/ipsec_addrlenof.3
+#usr/man/man3/ipsec_addrtoa.3
+#usr/man/man3/ipsec_addrtosubnet.3
+#usr/man/man3/ipsec_addrtot.3
+#usr/man/man3/ipsec_addrtypeof.3
+#usr/man/man3/ipsec_anyaddr.3
+#usr/man/man3/ipsec_atoaddr.3
+#usr/man/man3/ipsec_atoasr.3
+#usr/man/man3/ipsec_atosubnet.3
+#usr/man/man3/ipsec_atoul.3
+#usr/man/man3/ipsec_bitstomask.3
+#usr/man/man3/ipsec_broadcastof.3
+#usr/man/man3/ipsec_copyright_notice.3
+#usr/man/man3/ipsec_datatot.3
+#usr/man/man3/ipsec_goodmask.3
+#usr/man/man3/ipsec_hostof.3
+#usr/man/man3/ipsec_initaddr.3
+#usr/man/man3/ipsec_initsaid.3
+#usr/man/man3/ipsec_initsubnet.3
+#usr/man/man3/ipsec_isanyaddr.3
+#usr/man/man3/ipsec_isloopbackaddr.3
+#usr/man/man3/ipsec_isunspecaddr.3
+#usr/man/man3/ipsec_loopbackaddr.3
+#usr/man/man3/ipsec_maskof.3
+#usr/man/man3/ipsec_masktobits.3
+#usr/man/man3/ipsec_masktocount.3
+#usr/man/man3/ipsec_networkof.3
+#usr/man/man3/ipsec_optionsfrom.3
+#usr/man/man3/ipsec_portof.3
+#usr/man/man3/ipsec_rangetoa.3
+#usr/man/man3/ipsec_rangetosubnet.3
+#usr/man/man3/ipsec_sameaddr.3
+#usr/man/man3/ipsec_sameaddrtype.3
+#usr/man/man3/ipsec_samesaid.3
+#usr/man/man3/ipsec_samesubnet.3
+#usr/man/man3/ipsec_samesubnettype.3
+#usr/man/man3/ipsec_satot.3
+#usr/man/man3/ipsec_setportof.3
+#usr/man/man3/ipsec_sockaddrlenof.3
+#usr/man/man3/ipsec_sockaddrof.3
+#usr/man/man3/ipsec_subnetinsubnet.3
+#usr/man/man3/ipsec_subnetishost.3
+#usr/man/man3/ipsec_subnetof.3
+#usr/man/man3/ipsec_subnettoa.3
+#usr/man/man3/ipsec_subnettot.3
+#usr/man/man3/ipsec_subnettypeof.3
+#usr/man/man3/ipsec_tnatoaddr.3
+#usr/man/man3/ipsec_ttoaddr.3
+#usr/man/man3/ipsec_ttodata.3
+#usr/man/man3/ipsec_ttosa.3
+#usr/man/man3/ipsec_ttosubnet.3
+#usr/man/man3/ipsec_ttoul.3
+#usr/man/man3/ipsec_ultoa.3
+#usr/man/man3/ipsec_ultot.3
+#usr/man/man3/ipsec_unspecaddr.3
+#usr/man/man3/ipsec_version.3
+#usr/man/man3/ipsec_version_code.3
+#usr/man/man3/ipsec_version_string.3
+#usr/man/man5/ipsec.conf.5
+#usr/man/man5/ipsec.secrets.5
+#usr/man/man5/ipsec_eroute.5
+#usr/man/man5/ipsec_klipsdebug.5
+#usr/man/man5/ipsec_spi.5
+#usr/man/man5/ipsec_spigrp.5
+#usr/man/man5/ipsec_tncfg.5
+#usr/man/man5/ipsec_trap_count.5
+#usr/man/man5/ipsec_trap_sendcount.5
+#usr/man/man5/ipsec_version.5
+#usr/man/man5/pf_key.5
+#usr/man/man8/ipsec.8
+#usr/man/man8/ipsec__confread.8
+#usr/man/man8/ipsec__copyright.8
+#usr/man/man8/ipsec__include.8
+#usr/man/man8/ipsec__keycensor.8
+#usr/man/man8/ipsec__plutoload.8
+#usr/man/man8/ipsec__plutorun.8
+#usr/man/man8/ipsec__realsetup.8
+#usr/man/man8/ipsec__secretcensor.8
+#usr/man/man8/ipsec__startklips.8
+#usr/man/man8/ipsec__updown.8
+#usr/man/man8/ipsec__updown_x509.8
+#usr/man/man8/ipsec_auto.8
+#usr/man/man8/ipsec_barf.8
+#usr/man/man8/ipsec_calcgoo.8
+#usr/man/man8/ipsec_eroute.8
+#usr/man/man8/ipsec_ikeping.8
+#usr/man/man8/ipsec_klipsdebug.8
+#usr/man/man8/ipsec_livetest.8
+#usr/man/man8/ipsec_look.8
+#usr/man/man8/ipsec_mailkey.8
+#usr/man/man8/ipsec_manual.8
+#usr/man/man8/ipsec_newhostkey.8
+#usr/man/man8/ipsec_pf_key.8
+#usr/man/man8/ipsec_pluto.8
+#usr/man/man8/ipsec_ranbits.8
+#usr/man/man8/ipsec_rsasigkey.8
+#usr/man/man8/ipsec_secrets.8
+#usr/man/man8/ipsec_setup.8
+#usr/man/man8/ipsec_showdefaults.8
+#usr/man/man8/ipsec_showhostkey.8
+#usr/man/man8/ipsec_spi.8
+#usr/man/man8/ipsec_spigrp.8
+#usr/man/man8/ipsec_tncfg.8
+#usr/man/man8/ipsec_verify.8
+usr/sbin/ipsec
+#usr/share/doc/openswan
+#usr/share/doc/openswan/index.html
+#usr/share/doc/openswan/ipsec.8.html
+#usr/share/doc/openswan/ipsec.conf-sample
+#usr/share/doc/openswan/ipsec.conf.5.html
+#usr/share/doc/openswan/ipsec.secrets.5.html
+#usr/share/doc/openswan/ipsec__confread.8.html
+#usr/share/doc/openswan/ipsec__copyright.8.html
+#usr/share/doc/openswan/ipsec__include.8.html
+#usr/share/doc/openswan/ipsec__keycensor.8.html
+#usr/share/doc/openswan/ipsec__plutoload.8.html
+#usr/share/doc/openswan/ipsec__plutorun.8.html
+#usr/share/doc/openswan/ipsec__realsetup.8.html
+#usr/share/doc/openswan/ipsec__secretcensor.8.html
+#usr/share/doc/openswan/ipsec__startklips.8.html
+#usr/share/doc/openswan/ipsec__updown.8.html
+#usr/share/doc/openswan/ipsec__updown_x509.8.html
+#usr/share/doc/openswan/ipsec_addrbytesof.3.html
+#usr/share/doc/openswan/ipsec_addrbytesptr.3.html
+#usr/share/doc/openswan/ipsec_addrcmp.3.html
+#usr/share/doc/openswan/ipsec_addrinsubnet.3.html
+#usr/share/doc/openswan/ipsec_addrlenof.3.html
+#usr/share/doc/openswan/ipsec_addrtoa.3.html
+#usr/share/doc/openswan/ipsec_addrtosubnet.3.html
+#usr/share/doc/openswan/ipsec_addrtot.3.html
+#usr/share/doc/openswan/ipsec_addrtypeof.3.html
+#usr/share/doc/openswan/ipsec_anyaddr.3.html
+#usr/share/doc/openswan/ipsec_atoaddr.3.html
+#usr/share/doc/openswan/ipsec_atoasr.3.html
+#usr/share/doc/openswan/ipsec_atosubnet.3.html
+#usr/share/doc/openswan/ipsec_atoul.3.html
+#usr/share/doc/openswan/ipsec_auto.8.html
+#usr/share/doc/openswan/ipsec_barf.8.html
+#usr/share/doc/openswan/ipsec_bitstomask.3.html
+#usr/share/doc/openswan/ipsec_broadcastof.3.html
+#usr/share/doc/openswan/ipsec_calcgoo.8.html
+#usr/share/doc/openswan/ipsec_copyright_notice.3.html
+#usr/share/doc/openswan/ipsec_datatot.3.html
+#usr/share/doc/openswan/ipsec_eroute.5.html
+#usr/share/doc/openswan/ipsec_eroute.8.html
+#usr/share/doc/openswan/ipsec_goodmask.3.html
+#usr/share/doc/openswan/ipsec_hostof.3.html
+#usr/share/doc/openswan/ipsec_ikeping.8.html
+#usr/share/doc/openswan/ipsec_initaddr.3.html
+#usr/share/doc/openswan/ipsec_initsaid.3.html
+#usr/share/doc/openswan/ipsec_initsubnet.3.html
+#usr/share/doc/openswan/ipsec_isanyaddr.3.html
+#usr/share/doc/openswan/ipsec_isloopbackaddr.3.html
+#usr/share/doc/openswan/ipsec_isunspecaddr.3.html
+#usr/share/doc/openswan/ipsec_keyblobtoid.3.html
+#usr/share/doc/openswan/ipsec_klipsdebug.5.html
+#usr/share/doc/openswan/ipsec_klipsdebug.8.html
+#usr/share/doc/openswan/ipsec_livetest.8.html
+#usr/share/doc/openswan/ipsec_look.8.html
+#usr/share/doc/openswan/ipsec_loopbackaddr.3.html
+#usr/share/doc/openswan/ipsec_lwdnsq.8.html
+#usr/share/doc/openswan/ipsec_mailkey.8.html
+#usr/share/doc/openswan/ipsec_manual.8.html
+#usr/share/doc/openswan/ipsec_maskof.3.html
+#usr/share/doc/openswan/ipsec_masktobits.3.html
+#usr/share/doc/openswan/ipsec_masktocount.3.html
+#usr/share/doc/openswan/ipsec_networkof.3.html
+#usr/share/doc/openswan/ipsec_newhostkey.8.html
+#usr/share/doc/openswan/ipsec_optionsfrom.3.html
+#usr/share/doc/openswan/ipsec_pf_key.5.html
+#usr/share/doc/openswan/ipsec_pf_key.8.html
+#usr/share/doc/openswan/ipsec_pluto.8.html
+#usr/share/doc/openswan/ipsec_portof.3.html
+#usr/share/doc/openswan/ipsec_prng.3.html
+#usr/share/doc/openswan/ipsec_prng_bytes.3.html
+#usr/share/doc/openswan/ipsec_prng_final.3.html
+#usr/share/doc/openswan/ipsec_prng_init.3.html
+#usr/share/doc/openswan/ipsec_ranbits.8.html
+#usr/share/doc/openswan/ipsec_rangetoa.3.html
+#usr/share/doc/openswan/ipsec_rangetosubnet.3.html
+#usr/share/doc/openswan/ipsec_rsasigkey.8.html
+#usr/share/doc/openswan/ipsec_sameaddr.3.html
+#usr/share/doc/openswan/ipsec_sameaddrtype.3.html
+#usr/share/doc/openswan/ipsec_samesaid.3.html
+#usr/share/doc/openswan/ipsec_samesubnet.3.html
+#usr/share/doc/openswan/ipsec_samesubnettype.3.html
+#usr/share/doc/openswan/ipsec_satot.3.html
+#usr/share/doc/openswan/ipsec_secrets.8.html
+#usr/share/doc/openswan/ipsec_send-pr.8.html
+#usr/share/doc/openswan/ipsec_setportof.3.html
+#usr/share/doc/openswan/ipsec_setup.8.html
+#usr/share/doc/openswan/ipsec_showdefaults.8.html
+#usr/share/doc/openswan/ipsec_showhostkey.8.html
+#usr/share/doc/openswan/ipsec_showpolicy.8.html
+#usr/share/doc/openswan/ipsec_sockaddrlenof.3.html
+#usr/share/doc/openswan/ipsec_sockaddrof.3.html
+#usr/share/doc/openswan/ipsec_spi.5.html
+#usr/share/doc/openswan/ipsec_spi.8.html
+#usr/share/doc/openswan/ipsec_spigrp.5.html
+#usr/share/doc/openswan/ipsec_spigrp.8.html
+#usr/share/doc/openswan/ipsec_splitkeytoid.3.html
+#usr/share/doc/openswan/ipsec_starter.8.html
+#usr/share/doc/openswan/ipsec_subnetinsubnet.3.html
+#usr/share/doc/openswan/ipsec_subnetishost.3.html
+#usr/share/doc/openswan/ipsec_subnetof.3.html
+#usr/share/doc/openswan/ipsec_subnettoa.3.html
+#usr/share/doc/openswan/ipsec_subnettot.3.html
+#usr/share/doc/openswan/ipsec_subnettypeof.3.html
+#usr/share/doc/openswan/ipsec_tnatoaddr.3.html
+#usr/share/doc/openswan/ipsec_tncfg.5.html
+#usr/share/doc/openswan/ipsec_tncfg.8.html
+#usr/share/doc/openswan/ipsec_trap_count.5.html
+#usr/share/doc/openswan/ipsec_trap_sendcount.5.html
+#usr/share/doc/openswan/ipsec_ttoaddr.3.html
+#usr/share/doc/openswan/ipsec_ttodata.3.html
+#usr/share/doc/openswan/ipsec_ttosa.3.html
+#usr/share/doc/openswan/ipsec_ttosubnet.3.html
+#usr/share/doc/openswan/ipsec_ttoul.3.html
+#usr/share/doc/openswan/ipsec_ultoa.3.html
+#usr/share/doc/openswan/ipsec_ultot.3.html
+#usr/share/doc/openswan/ipsec_unspecaddr.3.html
+#usr/share/doc/openswan/ipsec_verify.8.html
+#usr/share/doc/openswan/ipsec_version.3.html
+#usr/share/doc/openswan/ipsec_version.5.html
+#usr/share/doc/openswan/ipsec_version_code.3.html
+#usr/share/doc/openswan/ipsec_version_string.3.html
+var/run/pluto

diff --git a/config/syslinux/unattended.conf b/config/syslinux/unattended.conf
index a7a94e4d91a9d70fb13914e6e3021a6354ca7de1..5adf279001c2c7274bbf8235a77172086a7284ee 100644 (file)
--- a/config/syslinux/unattended.conf
+++ b/config/syslinux/unattended.conf
@@ -1,6 +1,6 @@
 DOMAINNAME=localdomain
 HOSTNAME=ipfire
-KEYMAP=/usr/share/kbd/keymaps/i386/qwerty/de.map.gz
+KEYMAP=/lib/kbd/keymaps/i386/qwertz/de-latin1-nodeadkeys.map.gz
 LANGUAGE=de
 TIMEZONE=/usr/share/zoneinfo/posix/Europe/Berlin
 THEME=ipfire

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index f73fe01ac8512070548b2a6b6283a649eb89c732..b436d1a5b368fbeb0a402fdbf21089385b36f96c 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -106,6 +106,7 @@
 * iptraf-3.0.0
 * iptstate-2.1
 * iputils-ss020927
+* isapnptools-1.26
 * java-1.5.0_06-for-ipfire
 * jpegsrc.v6b
 * kbd-1.12

diff --git a/html/cgi-bin/iptables.cgi b/html/cgi-bin/iptables.cgi
index bcb5e6ffad9280d6c61f49b8115b0a503e5d9647..90bdf6e92ca28d6e2d040ebf60f7aff479e8bf70 100644 (file)
--- a/html/cgi-bin/iptables.cgi
+++ b/html/cgi-bin/iptables.cgi
@@ -28,7 +28,7 @@ print <<END
     <PRE>
 END
 ;
-       open (FILE, '/home/httpd/html/iptables.txt');
+       open (FILE, '/srv/web/ipfire/html/iptables.txt');
        while (<FILE>)
        {
                $iplines[$lines] = $_;
@@ -55,7 +55,7 @@ print <<END
     <PRE>
 END
 ;
-       open (FILEMAN, '/home/httpd/html/iptablesmangle.txt');
+       open (FILEMAN, '/srv/web/ipfire/html/iptablesmangle.txt');
        while (<FILEMAN>)
        {
                $ipmanlines[$manlines] = $_;
@@ -82,7 +82,7 @@ print <<END
     <PRE>
 END
 ;
-       open (FILENAT, '/home/httpd/html/iptablesnat.txt');
+       open (FILENAT, '/srv/web/ipfire/html/iptablesnat.txt');
        while (<FILENAT>)
        {
                $ipnatlines[$natlines] = $_;
@@ -103,6 +103,6 @@ END
 &Header::closebigbox();
 &Header::closepage();
 
-system(rm -f "/home/httpd/html/iptables.txt");
-system(rm -f "/home/httpd/html/iptablesmangle.txt");
-system(rm -f "/home/httpd/html/iptablesnat.txt");
+system(rm -f "/srv/web/ipfire/html/iptables.txt");
+system(rm -f "/srv/web/ipfire/html/iptablesmangle.txt");
+system(rm -f "/srv/web/ipfire/html/iptablesnat.txt");

diff --git a/lfs/boot.img b/lfs/boot.img
deleted file mode 100644 (file)
index 0ddeb87..0000000
--- a/lfs/boot.img
+++ /dev/null
@@ -1,71 +0,0 @@
-###############################################################################
-# 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
-
-VER = ipfire
-
-THISAPP    = boot-$(VERSION).img
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-install : $(TARGET)
-
-check :
-
-download :
-
-md5 :
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) :
-       if [ "$(MACHINE)" = "i586" ]; then \
-               dd if=/dev/zero of=/install/images/boot-$(VERSION).img bs=1024 count=1440; \
-               mkdosfs -f 1 -r 16 /install/images/boot-$(VERSION).img; \
-               syslinux -s /install/images/boot-$(VERSION).img; \
-               for i in `seq 0 7`; do \
-                   if (! losetup /dev/loop$${i} >/dev/null 2>&1 ); then \
-                       LOOPNUM=$$i; \
-                       LOOPDEV="/dev/loop$${i}"; \
-                       break; \
-                   fi; \
-               done; \
-               losetup $$LOOPDEV /install/images/boot-$(VERSION).img; \
-               mount -t msdos $$LOOPDEV /install/mnt; \
-               sed -e 's/boot IPFire/boot IPFire $(VERSION)/' $(DIR_SRC)/config/kernel/install-message \
-                       > /install/mnt/message; \
-               cp $(DIR_SRC)/config/kernel/syslinux.cfg    /install/mnt/syslinux.cfg; \
-               cp /boot/vmlinuz-$(KVER)                    /install/mnt/vmlinuz; \
-               cp /install/images/fdinitrd.gz              /install/mnt/instroot.gz; \
-               umount /install/mnt; \
-               losetup -d $$LOOPDEV; \
-       fi

diff --git a/lfs/driver.img b/lfs/driver.img
deleted file mode 100644 (file)
index 90732c1..0000000
--- a/lfs/driver.img
+++ /dev/null
@@ -1,82 +0,0 @@
-###############################################################################
-# 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
-
-VER = ipfire
-
-THISAPP    = driver-$(VERSION).img
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-install : $(TARGET)
-
-check :
-
-download :
-
-md5 :
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) :
-       @$(PREBUILD)
-       # make new dependencies 
-       depmod -a -F /boot/System.map-$(KVER) $(KVER)
-       depmod -a -F /boot/System.map-$(KVER)-smp $(KVER)-smp
-
-       # Create drivers floppy
-       cd /tmp && rm -rf drivers.tgz drivers.tar bin lib etc var
-       cd / && tar -cf /tmp/drivers.tar \
-               --exclude=lib/modules/$(KVER)/kernel/{arch,fs} \
-               --exclude=lib/modules/$(KVER)/kernel/drivers/{acpi,atm,bluetooth,block,char,cdrom,hwmon,ide} \
-               --exclude=lib/modules/$(KVER)/kernel/drivers/{ieee1394,isdn,mmc,scsi,md,message,video} \
-               --exclude=lib/modules/$(KVER)/kernel/drivers/net/{wan,ppp*,slip*,slhc*,tun*,wireless} \
-               --exclude=lib/modules/$(KVER)/kernel/drivers/usb/{atm,input,storage,host} \
-               --exclude=lib/modules/$(KVER)/kernel/drivers/usb/{3cp4218.ko,acm.ko,amedyn.ko,cxacru.ko} \
-               --exclude=lib/modules/$(KVER)/kernel/drivers/usb/{speedtch.ko,hid.ko,usbcore.ko,at76c50*.ko} \
-               --exclude=lib/modules/$(KVER)/kernel/net/{8021q,atm,bluetooth,bridge,ieee80211,ipsec,ipv4} \
-               --exclude=lib/modules/$(KVER)/kernel/net/{wanrouter,netfilter,sched} \
-               --exclude=lib/modules/$(KVER)/{build,extra,misc,modules.*,source} \
-               lib/modules/$(KVER)
-       cd /tmp && tar xf drivers.tar
-       cd /tmp && mkdir -p {bin,var/run}
-       cd /tmp && tar -cf - bin var lib/modules/$(KVER) | gzip -9 -c > drivers.tgz
-
-       ls -l /tmp/drivers.tgz
-
-       dd if=/tmp/drivers.tgz of=/install/images/drivers-$(VERSION).img bs=2880k count=1 conv=sync
-       rm -rf /tmp/drivers.tgz /tmp/drivers.tar /tmp/bin /tmp/lib
-
-       ### If this fails, the disk is TOO FULL !!!!
-       tar tzf /install/images/drivers-$(VERSION).img >/dev/null 2>&1
-
-       @$(POSTBUILD)

diff --git a/lfs/initrd b/lfs/initrd
index c58a25eb9beacef80c01c383b8b65c805617d54f..4a9a7a45d4c1ee1679916a3cabb5240d5c821b27 100644 (file)
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -61,6 +61,33 @@ $(TARGET) :
        chmod 755 /install/initrd/etc/halt /install/initrd/etc/rc
        cp -f /usr/share/terminfo/l/linux /install/initrd/usr/share/terminfo/l
 
+       # Install SCSI Drivers
+       cp -rf /lib/modules/$(KVER)/kernel/drivers/{scsi,message/fusion} \
+               /lib/modules/$(KVER)/kernel/drivers/block/{DAC960.ko,cpqarray.ko,cciss.ko} \
+               /lib/modules/$(KVER)/kernel/drivers/ide \
+               /lib/modules/$(KVER)/kernel/drivers/cdrom \
+               /lib/modules/$(KVER)/kernel/drivers/ieee1394 \
+               /install/initrd/lib/modules/$(KVER)/kernel/drivers/
+       rm -f   /install/initrd/lib/modules/$(KVER)/kernel/drivers/message/fusion/mptlan*
+
+       # make new dependencies 
+       depmod -a -F /boot/System.map-$(KVER) $(KVER)
+       depmod -a -F /boot/System.map-$(KVER)-smp $(KVER)-smp
+
+       cd / && tar -cvf /tmp/drivers.tar \
+               --exclude=lib/modules/$(KVER)/kernel/{arch,fs} \
+               --exclude=lib/modules/$(KVER)/kernel/drivers/{acpi,atm,bluetooth,block,char,cdrom,hwmon,ide} \
+               --exclude=lib/modules/$(KVER)/kernel/drivers/{ieee1394,isdn,mmc,scsi,md,message,video} \
+               --exclude=lib/modules/$(KVER)/kernel/drivers/net/{wan,ppp*,slip*,slhc*,tun*,wireless} \
+               --exclude=lib/modules/$(KVER)/kernel/drivers/usb/{atm,input,storage,host} \
+               --exclude=lib/modules/$(KVER)/kernel/drivers/usb/{3cp4218.ko,acm.ko,amedyn.ko,cxacru.ko} \
+               --exclude=lib/modules/$(KVER)/kernel/drivers/usb/{speedtch.ko,hid.ko,usbcore.ko,at76c50*.ko} \
+               --exclude=lib/modules/$(KVER)/kernel/net/{8021q,atm,bluetooth,bridge,ieee80211,ipsec,ipv4} \
+               --exclude=lib/modules/$(KVER)/kernel/net/{wanrouter,netfilter,sched} \
+               --exclude=lib/modules/$(KVER)/{build,extra,misc,modules.*,source} \
+               lib/modules/$(KVER)
+       cd /install/initrd/ && tar -xvf /tmp/drivers.tar && rm -f /tmp/drivers.tar
+
        # Extra modules
        -mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/scsi
        cp -f /lib/modules/$(KVER)/kernel/drivers/scsi/{scsi_mod.ko,sd_mod.ko,sr_mod.ko} \
@@ -92,34 +119,13 @@ $(TARGET) :
 
        cd /install/initrd/lib/ && ln -sf libgcc_s.so.1 libgcc_s.so
        
-       # Floppy initrd
        -mkdir -p /install/{images,mnt}
        rm -rf /install/mnt/*
 
        cp -aR /install/initrd/* /install/mnt
-       # cp -a /install/misc/bin/* /install/mnt/bin
 
        # make new dependencies
        depmod -a -F /boot/System.map-$(KVER) $(KVER)
-       touch /install/mnt/FLOPPYBOOT
-
-       RAMDISK_SIZE=8192 && \
-           dd if=/dev/zero of=/install/images/fdinitrd bs=1k count=$${RAMDISK_SIZE}
-       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 /install/images/fdinitrd && \
-           mke2fs -m 0 -N 1024 $$LOOPDEV && \
-           mount -t ext2 $$LOOPDEV /install/mnt && \
-           rm -rf /install/mnt/lost+found && \
-           cp -aR /install/initrd/* /install/mnt/ && \
-           cd /install/mnt/ && find ./ -ls > $(DIR_INFO)/_build.fdinitrd && \
-           cd / && umount /install/mnt && \
-           losetup -d $$LOOPDEV
-       gzip -9 /install/images/fdinitrd
 
        RAMDISK_SIZE=16384 && \
            dd if=/dev/zero of=/install/images/cdinitrd bs=1k count=$${RAMDISK_SIZE}
@@ -134,8 +140,6 @@ $(TARGET) :
            mount -t ext2 $$LOOPDEV /install/mnt && \
            rm -rf /install/mnt/lost+found && \
            cp -aR /install/initrd/* /install/mnt/ && \
-           cd /install/mnt && tar xfz /install/images/drivers-$(VERSION).img && \
-           cd /install/mnt && tar xfz /install/images/scsidrv-$(VERSION).img && \
            cd /install/mnt/ && find ./ -ls > $(DIR_INFO)/_build.cdinitrd && \
            touch /install/mnt/CDROMBOOT && \
            cd / && umount /install/mnt && \

diff --git a/lfs/initscripts b/lfs/initscripts
index 0a2f92d822cada0bfd61707af04e0da557fe6f6e..cb4506ffb215d60784a27a26e2fbd727a5f1edfd 100644 (file)
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -73,9 +73,9 @@ $(TARGET) :
 
        ln -sf ../init.d/sysklogd    /etc/rc.d/rc0.d/K90sysklogd
        ln -sf ../init.d/sendsignals /etc/rc.d/rc0.d/S60sendsignals
-       ln -sf ../init.d/mountfs     /etc/rc.d/rc0.d/S70mountfs
-       ln -sf ../init.d/swap        /etc/rc.d/rc0.d/S80swap
-       ln -sf ../init.d/localnet    /etc/rc.d/rc0.d/S90localnet
+       ln -sf ../init.d/localnet    /etc/rc.d/rc0.d/S70localnet
+       ln -sf ../init.d/mountfs     /etc/rc.d/rc0.d/S80mountfs
+       ln -sf ../init.d/swap        /etc/rc.d/rc0.d/S90swap
        ln -sf ../init.d/halt        /etc/rc.d/rc0.d/S99halt
        ln -sf ../init.d/sysklogd    /etc/rc.d/rc3.d/S10sysklogd
        ln -sf ../init.d/sysklogd    /etc/rc.d/rc6.d/K90sysklogd
@@ -110,6 +110,6 @@ $(TARGET) :
        ln -sf ../init.d/localnet    /etc/rc.d/rcsysinit.d/S80localnet
        ln -sf ../init.d/sysctl      /etc/rc.d/rcsysinit.d/S90sysctl
 
-#      chgrp nobody /etc/rc.d/rc.red
-#      chmod 4750 /etc/rc.d/rc.red
+       chgrp nobody /etc/rc.d/init.d/red
+       chmod 4750 /etc/rc.d/init.d/red
        @$(POSTBUILD)

diff --git a/lfs/pcmciautils b/lfs/pcmciautils
deleted file mode 100644 (file)
index a3c0862..0000000
--- a/lfs/pcmciautils
+++ /dev/null
@@ -1,92 +0,0 @@
-###############################################################################
-# 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
-
-VER        = 014
-
-THISAPP    = pcmciautils-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(LFS_PASS)" "install"
-  TARGET     = $(DIR_INFO)/$(THISAPP)-install
-else
-  TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 3f07c926875f6c5dcb83240f39725177
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(LFS_PASS)" "install"
-#      cd $(DIR_APP) && make -C cardmgr
-#      cd $(DIR_APP) && mkdir -p /install/misc/bin
-#      cd $(DIR_APP) && install -s -m 0755 cardmgr/cardmgr /install/misc/bin
-#      cd $(DIR_APP) && install -s -m 0755 cardmgr/cardctl /install/misc/bin
-else
-       cd $(DIR_APP) && make
-       cd $(DIR_APP) && make install
-
-       # Install our own extra pcmcia configs
-       cp $(DIR_SRC)/src/pcmcia/*.conf /etc/pcmcia
-endif
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/lfs/scsi.img b/lfs/scsi.img
deleted file mode 100644 (file)
index 0940b58..0000000
--- a/lfs/scsi.img
+++ /dev/null
@@ -1,76 +0,0 @@
-###############################################################################
-# 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
-
-VER = ipfire
-
-THISAPP    = scsi-$(VERSION).img
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-install : $(TARGET)
-
-check :
-
-download :
-
-md5 :
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) :
-       @$(PREBUILD)
-
-       # Create SCSI drivers
-       -mkdir -p /install/images
-       cd /tmp && rm -rf scsi.tgz scsi.tar bin etc lib var
-
-       cd / && tar -cf /tmp/scsi.tar \
-               lib/modules/$(KVER)/kernel/drivers/{scsi,message/fusion} \
-               lib/modules/$(KVER)/kernel/drivers/block/{DAC960.ko,cpqarray.ko,cciss.ko} \
-               lib/modules/$(KVER)/kernel/drivers/ide \
-               lib/modules/$(KVER)/kernel/drivers/cdrom \
-               lib/modules/$(KVER)/kernel/drivers/ieee1394
-       cd /tmp && tar xf scsi.tar
-       cd /tmp && rm -f lib/modules/$(KVER)/kernel/drivers/message/fusion/mptlan*
-       cd /tmp && mkdir -p {bin,var/run}
-       cd /tmp && tar -cf - bin var lib/modules/$(KVER) | gzip -9 -c > scsi.tgz
-
-       ls -l /tmp/scsi.tgz
-
-       dd if=/tmp/scsi.tgz of=/install/images/scsidrv-$(VERSION).img bs=2880k count=1 conv=sync
-       rm -f /tmp/scsi.tgz
-
-       ### If this fails, the disk is TOO FULL !!!!
-       tar tfz /install/images/scsidrv-$(VERSION).img >/dev/null 2>&1
-
-       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 9100b53a513689988db6303f92d989fc2914e74f..f675103786fb558be69c475a451aa24fc15e7885 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -568,12 +568,7 @@ buildinstaller() {
   installmake kudzu
 #  installmake bootsplash
   installmake installer
-  installmake scsi.img # this is to be deleted
-  installmake driver.img       # this is to be deleted
   installmake initrd
-  installmake boot.img # this is to be deleted
-#  ipfiremake as86             # this is to be deleted
-#  ipfiremake mbr              # this is to be deleted
 }
 
 buildpackages() {

diff --git a/src/initscripts/init.d/cleanfs b/src/initscripts/init.d/cleanfs
index 9a4e1860108807fdb92f51a3e728958dcb50eb68..c102d02ea3a973789b2d6b0bba073e38c778d64f 100644 (file)
--- a/src/initscripts/init.d/cleanfs
+++ b/src/initscripts/init.d/cleanfs
@@ -78,6 +78,17 @@ case "${1}" in
                find . -xdev -mindepth 1 ! -name lost+found \
                        -delete || failed=1
 
+               boot_mesg -n " /var/ipfire/dhcp" ${NORMAL}
+               cd /var/ipfire/dhcpc/ && 
+               find . -name *.pid -exec rm -f {} \; || failed=1
+               cd /var/ipfire/dhcpc/ && 
+               find . -name *.cache -exec rm -f {} \; || failed=1
+               cd /var/ipfire/dhcpc/ && 
+               find . -name *.info -exec rm -f {} \; || failed=1
+
+               boot_mesg -n " /var/ipfire/red" ${NORMAL}
+               cd /var/ipfire/red/ && find . -name active -exec rm -f {} \; || failed=1
+
                boot_mesg -n " /var/lock" ${NORMAL}
                cd /var/lock &&
                find . -type f ! -newer /proc -exec rm -f {} \; || failed=1

diff --git a/src/initscripts/init.d/localnet b/src/initscripts/init.d/localnet
index 4e5010229dfd3dc1107afaec59deebd207a9f591..7a19b6d547c808e7a4d2fa372094c9549b2f187b 100644 (file)
--- a/src/initscripts/init.d/localnet
+++ b/src/initscripts/init.d/localnet
@@ -14,7 +14,7 @@
 
 . /etc/sysconfig/rc
 . ${rc_functions}
-. /etc/sysconfig/network
+. /var/ipfire/main/settings
 
 case "${1}" in
        start)

diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index 73ccfc224dfcc68dca55324ae271a72ea340fd4e..bb1b19d0cc74866debf0d83ec63c635865131242 100644 (file)
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -39,10 +39,6 @@ case "${1}" in
                modprobe ip_nat_mms
                modprobe ip_conntrack_pptp
                modprobe ip_nat_pptp
-               modprobe ip_conntrack_proto_gre
-               modprobe ip_nat_proto_gre
-               modprobe ip_conntrack_quake3
-               modprobe ip_nat_quake3
 
                # Remove possible leftover files
                rm -f CONFIG_ROOT/red/{active,device,dial-on-demand,dns1,dns2,local-ipaddress,remote-ipaddress,resolv.conf}

diff --git a/src/initscripts/init.d/setclock b/src/initscripts/init.d/setclock
index 2b97d684b012dc1030a2c6567b7e3555b34ad7b3..908d4906abf84cca25dd37b6453bf8be3db345b6 100644 (file)
--- a/src/initscripts/init.d/setclock
+++ b/src/initscripts/init.d/setclock
@@ -14,21 +14,9 @@
 
 . /etc/sysconfig/rc
 . ${rc_functions}
-. /etc/sysconfig/clock
 
 CLOCKPARAMS=
 
-case "${UTC}" in
-       yes|true|1)
-               CLOCKPARAMS="${CLOCKPARAMS} --utc"
-               ;;
-
-       no|false|0)
-               CLOCKPARAMS="${CLOCKPARAMS} --localtime"
-               ;;
-
-esac
-
 case ${1} in
        start)
                boot_mesg "Setting system clock..."

diff --git a/src/initscripts/sysconfig/clock b/src/initscripts/sysconfig/clock
deleted file mode 100644 (file)
index ed6f78b..0000000
--- a/src/initscripts/sysconfig/clock
+++ /dev/null
@@ -1,5 +0,0 @@
-# Begin /etc/sysconfig/clock
-
-UTC=0
-
-# End /etc/sysconfig/clock

diff --git a/src/initscripts/sysconfig/console b/src/initscripts/sysconfig/console
deleted file mode 100644 (file)
index 0a57eb2..0000000
--- a/src/initscripts/sysconfig/console
+++ /dev/null
@@ -1,7 +0,0 @@
-# Begin /etc/sysconfig/console
-
-KEYMAP="de-latin1-nodeadkeys"
-KEYMAP_CORRECTIONS="euro2"
-FONT="lat0-16 -m 8859-15"
-
-# End /etc/sysconfig/console

diff --git a/src/initscripts/sysconfig/network b/src/initscripts/sysconfig/network
deleted file mode 100644 (file)
index 8705916..0000000
--- a/src/initscripts/sysconfig/network
+++ /dev/null
@@ -1 +0,0 @@
-HOSTNAME=ipfire

diff --git a/src/misc-progs/getipstat.c b/src/misc-progs/getipstat.c
index 70171a263185e88df20c8cba9cf2772797422613..38701686e8743ec841e54f58ec8cc25b293eb0b4 100644 (file)
--- a/src/misc-progs/getipstat.c
+++ b/src/misc-progs/getipstat.c
@@ -18,10 +18,10 @@ int main(void)
        if (!(initsetuid()))
                exit(1);
        
-       safe_system("/sbin/iptables -L -v -n > /home/httpd/html/iptables.txt");
-       safe_system("/sbin/iptables -L -v -n -t nat > /home/httpd/html/iptablesnat.txt");
-       safe_system("/sbin/iptables -t mangle -L -v -n > /home/httpd/html/iptablesmangle.txt");
-       safe_system("chown nobody.nobody /home/httpd/html/iptables.txt /home/httpd/html/iptablesnat.txt /home/httpd/html/iptablesmangle.txt");
+       safe_system("/sbin/iptables -L -v -n > /srv/web/ipfire/html/iptables.txt");
+       safe_system("/sbin/iptables -L -v -n -t nat > /srv/web/ipfire/html/iptablesnat.txt");
+       safe_system("/sbin/iptables -t mangle -L -v -n > /srv/web/ipfire/html/iptablesmangle.txt");
+       safe_system("chown nobody.nobody /srv/web/ipfire/html/iptables.txt /srv/web/ipfire/html/iptablesnat.txt /srv/web/ipfire/html/iptablesmangle.txt");
        
        return 0;
 }

diff --git a/src/pcmcia/isdnextra.conf b/src/pcmcia/isdnextra.conf
deleted file mode 100644 (file)
index f4683ab..0000000
--- a/src/pcmcia/isdnextra.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-card "Diehl ISDN-DIVA"
-  manfid 0x0121, 0x2032
-  bind "elsa_cs"

diff --git a/src/pcmcia/netextra.conf b/src/pcmcia/netextra.conf
deleted file mode 100644 (file)
index f5dd953..0000000
--- a/src/pcmcia/netextra.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-card "Socket EA Lan Adapter"
-  manfid 0x0104, 0x0008
-  bind "pcnet_cs"