Hinzugefügt:

[ipfire-2.x.git] / lfs / configroot

diff --git a/lfs/configroot b/lfs/configroot
index f6351f13c47b46ec93b017713147a87898729826..376a4c799a40a5a6047e08fc13163cab89d8f5fe 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -57,8 +57,8 @@ $(TARGET) :
 
        # Create all directories
        for i in addon-lang alcatelusb auth backup backup/sets ca certs cnx_pci crls ddns dhcp dhcpc dmzholes \
-           eagle-usb eciadsl ethernet isdn key langs logging main modem optionsfw patches portfw \
-           ppp private proxy red remote shaping snort time vpn wireless xtaccess ; do \
+           eagle-usb eciadsl ethernet isdn key langs logging main modem net-traffic optionsfw patches pakfire portfw \
+           ppp private proxy red remote shaping snort time uplinks vpn wireless xtaccess ; do \
                mkdir -p $(CONFIG_ROOT)/$$i; \
        done
 
@@ -78,18 +78,19 @@ $(TARGET) :
        cp $(DIR_SRC)/config/cfgroot/header.pl                  $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/general-functions.pl       $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/lang.pl                    $(CONFIG_ROOT)/
-       cp $(DIR_SRC)/config/cfgroot/countries.pl               $(CONFIG_ROOT)/
+       cp $(DIR_SRC)/config/cfgroot/countries.pl                       $(CONFIG_ROOT)/
        cp $(DIR_SRC)/config/cfgroot/backup-exclude             $(CONFIG_ROOT)/backup/exclude.system
        cp $(DIR_SRC)/config/cfgroot/backup-include             $(CONFIG_ROOT)/backup/include.system
        cp $(DIR_SRC)/config/cfgroot/backup-exclude.hardware    $(CONFIG_ROOT)/backup/exclude.hardware
        cp $(DIR_SRC)/config/cfgroot/advoptions-list            $(CONFIG_ROOT)/dhcp/advoptions-list
        cp $(DIR_SRC)/config/cfgroot/modem-defaults             $(CONFIG_ROOT)/modem/defaults
        cp $(DIR_SRC)/config/cfgroot/modem-settings             $(CONFIG_ROOT)/modem/settings
+       cp $(DIR_SRC)/config/cfgroot/net-traffic-lib.pl         $(CONFIG_ROOT)/net-traffic/net-traffic-lib.pl
        cp $(DIR_SRC)/config/cfgroot/proxy-acl                  $(CONFIG_ROOT)/proxy/acl-1.4
        cp $(DIR_SRC)/config/cfgroot/xtaccess-config            $(CONFIG_ROOT)/xtaccess/config
        cp $(DIR_SRC)/config/cfgroot/time-settings              $(CONFIG_ROOT)/time/settings
        cp $(DIR_SRC)/config/cfgroot/logging-settings           $(CONFIG_ROOT)/logging/settings
-       cp $(DIR_SRC)/config/cfgroot/ipcop.gpg                  $(CONFIG_ROOT)/key/
+#      cp $(DIR_SRC)/config/cfgroot/ipcop.gpg                  $(CONFIG_ROOT)/key/
        cp $(DIR_SRC)/langs/list                                $(CONFIG_ROOT)/langs/
 
        # Oneliner configfiles
@@ -97,7 +98,7 @@ $(TARGET) :
        echo  "VPN_DELAYED_START=0"     >>$(CONFIG_ROOT)/vpn/settings
        echo  "01"                      > $(CONFIG_ROOT)/certs/serial
        echo  "nameserver    1.2.3.4"   > $(CONFIG_ROOT)/ppp/fake-resolv.conf
-       echo "DISABLEPING=NO"           > $(CONFIG_ROOT)/optionsfw/settings
+       echo  "DISABLEPING=NO"          > $(CONFIG_ROOT)/optionsfw/settings
 
        # Symbolic links
        ln -sf /etc/rc.d/rc.updatered $(CONFIG_ROOT)/dhcpc/dhcpcd.exe