wireless-client: add wireless cfg to iso, backup and core71.

diff --git a/config/backup/include b/config/backup/include
index 9b086831142858547b104a20da5841877f995ffc..8463a89493c5d98776037a06adc000b84bda8c10 100644 (file)
--- a/config/backup/include
+++ b/config/backup/include
@@ -39,3 +39,4 @@
 /root/.gitconfig
 /root/.bash_history
 /var/ipfire/ethernet/aliases
 /root/.gitconfig
 /root/.bash_history
 /var/ipfire/ethernet/aliases

+/var/ipfire/ethernet/wireless

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index e97134ff298200310df443d81ee2e23f0d9b853a..3910b36a73258926faa8a11f0ee99aa26217c70c 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -36,6 +36,7 @@ var/ipfire/ethernet
 #var/ipfire/ethernet/scanned_nics
 #var/ipfire/ethernet/settings
 #var/ipfire/ethernet/vlans
 #var/ipfire/ethernet/scanned_nics
 #var/ipfire/ethernet/settings
 #var/ipfire/ethernet/vlans

+#var/ipfire/ethernet/wireless

 #var/ipfire/extrahd
 #var/ipfire/extrahd/bin
 var/ipfire/extrahd/bin/extrahd.pl
 #var/ipfire/extrahd
 #var/ipfire/extrahd/bin
 var/ipfire/extrahd/bin/extrahd.pl

diff --git a/config/rootfiles/core/71/filelists/files b/config/rootfiles/core/71/filelists/files
index 51d4ff49147d8ff22da0997443457102c515b987..b15981fb1b3a6f7f5e7bc5b45c3174c91f94ec67 100644 (file)
--- a/config/rootfiles/core/71/filelists/files
+++ b/config/rootfiles/core/71/filelists/files
@@ -13,3 +13,4 @@ etc/rc.d/rc6.d/K82wlanclient
 usr/local/bin/wirelessclient
 srv/web/ipfire/cgi-bin/wirelessclient.cgi
 var/ipfire/langs
 usr/local/bin/wirelessclient
 srv/web/ipfire/cgi-bin/wirelessclient.cgi
 var/ipfire/langs

+var/ipfire/backup/include

diff --git a/config/rootfiles/core/71/update.sh b/config/rootfiles/core/71/update.sh
index c83ffef9f7ab603b291ee5291114bbbe2c2f2a05..5a5e1b1e584564f3ff4cd22c3090cff94cbe39a8 100644 (file)
--- a/config/rootfiles/core/71/update.sh
+++ b/config/rootfiles/core/71/update.sh
@@ -39,6 +39,11 @@ done
 #Extract files
 extract_files
 
 #Extract files
 extract_files
 

+#
+#Create wireless config file...
+touch /var/ipfire/ethernet/wireless
+chown nobody:nobody /var/ipfire/ethernet/wireless
+

 #
 #Start services
 
 #
 #Start services
 

diff --git a/lfs/configroot b/lfs/configroot
index f8fe4264293fbb9ff273c8df6b643dadb76b723f..1f84a1691bbea53fa1164512ff751f0c4e4f77fd 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #

-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #

 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #


@@ -64,7 +64,7 @@ $(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 dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
        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 dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \

-           extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \
+           ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \

            isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \
            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 \
            isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \
            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 \