configroot: fix merge problem.

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 6849250d7ba2a7ab0df2d1ccfeb5b1bbf57bf846..8cd4a8a374d611ab4e46a71f14b16ebe5588c099 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -49,24 +49,25 @@ var/ipfire/extrahd/devices
 var/ipfire/extrahd/partitions
 var/ipfire/extrahd/scan
 var/ipfire/extrahd/settings
-var/ipfire/fwlogs
-var/ipfire/forward
-var/ipfire/forward/bin/rules.pl
+#var/ipfire/forward
+#var/ipfire/forward/bin
 var/ipfire/forward/bin/firewall-lib.pl
-var/ipfire/forward/settings
+var/ipfire/forward/bin/rules.pl
 var/ipfire/forward/config
-var/ipfire/forward/input
-var/ipfire/forward/outgoing
 var/ipfire/forward/dmz
+var/ipfire/forward/input
 var/ipfire/forward/nat
+var/ipfire/forward/outgoing
 var/ipfire/forward/p2protocols
-var/ipfire/fwhosts
-var/ipfire/fwhosts/icmp-types
+var/ipfire/forward/settings
+#var/ipfire/fwhosts
+var/ipfire/fwhosts/customgroups
 var/ipfire/fwhosts/customhosts
 var/ipfire/fwhosts/customnetworks
-var/ipfire/fwhosts/customgroups
-var/ipfire/fwhosts/customservices
 var/ipfire/fwhosts/customservicegrp
+var/ipfire/fwhosts/customservices
+var/ipfire/fwhosts/icmp-types
+var/ipfire/fwlogs
 #var/ipfire/fwlogs/ipsettings
 #var/ipfire/fwlogs/portsettings
 var/ipfire/general-functions.pl
@@ -126,16 +127,6 @@ var/ipfire/net-traffic
 #var/ipfire/nfs/nfs-server
 var/ipfire/optionsfw
 var/ipfire/optionsfw/settings
-#var/ipfire/outgoing
-#var/ipfire/outgoing/bin
-#var/ipfire/outgoing/bin/outgoingfw.pl
-#var/ipfire/outgoing/defaultservices
-#var/ipfire/outgoing/groups
-#var/ipfire/outgoing/groups/ipgroups
-#var/ipfire/outgoing/groups/macgroups
-#var/ipfire/outgoing/p2protocols
-#var/ipfire/outgoing/rules
-#var/ipfire/outgoing/settings
 var/ipfire/ovpn
 var/ipfire/ovpn/ccd.conf
 var/ipfire/ovpn/ccdroute

diff --git a/lfs/configroot b/lfs/configroot
index 341b146326ac02894162509313488464018ad96f..690b9c9769b94b3f22263a246e7c5ea2bf686644 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -51,9 +51,8 @@ $(TARGET) :
 
        # Create all directories
        for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dns dnsforward \
-                       ethernet extrahd/bin fwlogs isdn key langs logging mac main menu.d modem net-traffic \
-                       ethernet extrahd/bin fwlogs fwhosts forward forward/bin isdn key langs logging mac main  menu.d modem net-traffic \
-                       net-traffic/templates nfs optionsfw \
+                       ethernet extrahd/bin fwlogs fwhosts forward forward/bin isdn key langs logging mac main \
+                       menu.d modem net-traffic net-traffic/templates nfs optionsfw \
                        ovpn patches pakfire portfw ppp private proxy/advanced/cre \
                        proxy/calamaris/bin qos/bin red remote sensors snort time tripwire/report \
                        updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \
@@ -65,11 +64,11 @@ $(TARGET) :
        for i in auth/users backup/include.user backup/exclude.user \
            certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \
            dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
-           extrahd/scan extrahd/devices extrahd/partitions extrahd/settings forward/settings forward/config forward/input forward/outgoing forward/dmz forward/nat \
+           ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings forward/settings forward/config forward/input forward/outgoing forward/dmz forward/nat \
            fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwlogs/ipsettings fwlogs/portsettings \
            isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings \
            ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
-               ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
+           ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
            qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \
            vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \
            touch $(CONFIG_ROOT)/$$i; \