Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 251b287576ffeafc724fabfb440d64cae7481642..b9bd56ae949e50421d9d9c207ea54292552869ea 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -55,6 +55,8 @@ var/ipfire/langs
 #var/ipfire/langs/list
 var/ipfire/logging
 #var/ipfire/logging/settings
+var/ipfire/mac
+#var/ipfire/mac/settings
 var/ipfire/main
 #var/ipfire/main/hosts
 #var/ipfire/main/settings

diff --git a/config/rootfiles/core/29/filelists/files b/config/rootfiles/core/29/filelists/files
index 79b3e9624c1d44322702e233923b50cb740fbebb..5c404888d59bf2324907559ee065ca443a92f41e 100644 (file)
--- a/config/rootfiles/core/29/filelists/files
+++ b/config/rootfiles/core/29/filelists/files
@@ -14,6 +14,7 @@ var/ipfire/backup/include
 var/ipfire/langs/list
 var/ipfire/langs/de.pl
 var/ipfire/langs/en.pl
+var/ipfire/mac/settings
 var/ipfire/menu.d/50-firewall.menu
 var/ipfire/menu.d/30-network.menu
 srv/web/ipfire/cgi-bin/mac.cgi

diff --git a/lfs/configroot b/lfs/configroot
index 12214cd936808470770401887b58424732e5651a..e591e551798fe8563e0bd854878a2b8a6dce703b 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -51,7 +51,7 @@ $(TARGET) :
 
        # Create all directories
        for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes \
-           ethernet extrahd/bin fwlogs isdn key langs logging main  menu.d modem net-traffic \
+           ethernet extrahd/bin fwlogs isdn key langs logging mac main  menu.d modem net-traffic \
                        net-traffic/templates nfs optionsfw outgoing/bin 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 \
@@ -64,8 +64,8 @@ $(TARGET) :
            certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \
            dhcp/fixleases dhcp/advoptions dmzholes/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
            extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \
-           isdn/settings main/hosts main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules pakfire/settings \
-           portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
+           isdn/settings mac/settings main/hosts main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \
+           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 \
            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 \