luci-0.10: Merge r6925

diff --git a/modules/freifunk/root/etc/config/freifunk b/modules/freifunk/root/etc/config/freifunk
index b0009703f88c298c290c4df6c6007e7d27d381e6..9aa3f27c3439555a6b84c9120f8974de9dc45807 100644 (file)
--- a/modules/freifunk/root/etc/config/freifunk
+++ b/modules/freifunk/root/etc/config/freifunk
@@ -70,8 +70,8 @@ config 'defaults' 'wifi_iface'
        option 'sw_merge' '1'
 
 config 'defaults' 'interface'
-       option 'netmask' '255.0.0.0'
-       option 'dns' '88.198.178.18 141.54.1.1 212.204.49.83 208.67.220.220 208.67.222.222'
+       option 'netmask' '255.255.0.0'
+       option 'dns' '8.8.8.8 212.204.49.83 141.1.1.1'
 
 config 'defaults' 'alias'
        option 'netmask' '255.255.255.0'

diff --git a/modules/freifunk/root/etc/config/profile_aachen b/modules/freifunk/root/etc/config/profile_aachen
index 99baa9e2f6df5e6ab8c9320b3a2fd68b5b54968b..f78d9f95a38193690249f8afd04478ae8489c64e 100644 (file)
--- a/modules/freifunk/root/etc/config/profile_aachen
+++ b/modules/freifunk/root/etc/config/profile_aachen
@@ -7,6 +7,3 @@ config 'community' 'profile'
        option 'mesh_network' '10.90.0.0/16'
        option 'splash_network' '10.104.0.0/16'
        option 'splash_prefix' '28'
-
-config 'defaults' 'interface'
-       option 'netmask' '255.255.0.0'

diff --git a/modules/freifunk/root/etc/config/profile_bergischesland b/modules/freifunk/root/etc/config/profile_bergischesland
index 46ad71ceb2b1524e9c5cf79734a1d7ba2ad15c77..0de45430390d1fec36d582924806f66321cce5b3 100644 (file)
--- a/modules/freifunk/root/etc/config/profile_bergischesland
+++ b/modules/freifunk/root/etc/config/profile_bergischesland
@@ -13,7 +13,3 @@ config 'defaults' 'wifi_device'
 
 config 'defaults' 'wifi_iface'
        option 'bssid' '02:40:00:42:42:42'
-
-config 'defaults' 'interface'
-       option 'netmask' '255.255.0.0'
-

diff --git a/modules/freifunk/root/etc/config/profile_berlin b/modules/freifunk/root/etc/config/profile_berlin
index a37a6cb230fb8388502c488126509343794b63b7..c41144e48b907589e3562a6751222b4850e6826d 100644 (file)
--- a/modules/freifunk/root/etc/config/profile_berlin
+++ b/modules/freifunk/root/etc/config/profile_berlin
@@ -10,3 +10,7 @@ config 'community' 'profile'
 
 config 'defaults' 'wifi_device'
        option 'channel' '10'
+
+config 'defaults' 'interface'
+        option 'netmask' '255.0.0.0'
+

diff --git a/modules/freifunk/root/etc/config/profile_duesseldorf b/modules/freifunk/root/etc/config/profile_duesseldorf
index 64ebbac81d3e628ccbf61a4136e0b8e6b1716e4a..73273957c6e4da440b60a9deaa5d0322a69b5922 100644 (file)
--- a/modules/freifunk/root/etc/config/profile_duesseldorf
+++ b/modules/freifunk/root/etc/config/profile_duesseldorf
@@ -8,9 +8,6 @@ config 'community' 'profile'
        option 'latitude' '51.22347'
        option 'longitude' '6.78449'
 
-config 'defaults' 'interface'
-       option 'netmask' '255.255.0.0'
-
 config 'defaults' 'wifi_device'
        option 'channel' '3'
 

diff --git a/modules/freifunk/root/etc/config/profile_hannover b/modules/freifunk/root/etc/config/profile_hannover
index 99f2c46f1c26ddd4b0ea1eb0991e1a7adc51a893..008b6c70e32043042f2d4cc8fc4a78bcaaceb70a 100644 (file)
--- a/modules/freifunk/root/etc/config/profile_hannover
+++ b/modules/freifunk/root/etc/config/profile_hannover
@@ -10,7 +10,3 @@ config 'community' 'profile'
 
 config 'defaults' 'wifi_iface'
        option 'bssid' 'CA:FF:EE:CA:FF:EE'
-
-config 'defaults' 'interface'
-       option 'netmask' '255.255.0.0'
-

diff --git a/modules/freifunk/root/etc/config/profile_kiberpipa b/modules/freifunk/root/etc/config/profile_kiberpipa
index 628850a9f64ec39730ad928d654fc7c7f604421d..c2a96e47cc6eafb68eb0cb3845d52f667a8d5d18 100644 (file)
--- a/modules/freifunk/root/etc/config/profile_kiberpipa
+++ b/modules/freifunk/root/etc/config/profile_kiberpipa
@@ -13,4 +13,3 @@ config 'defaults' 'wifi_device'
 
 config 'defaults' 'interface'
        option 'dns' '10.14.0.1 208.67.222.220 208.67.220.222'
-       option 'netmask' '255.255.0.0'

diff --git a/modules/freifunk/root/etc/config/profile_leipzig b/modules/freifunk/root/etc/config/profile_leipzig
index 1418f7aae56a614e1387946e09e8561e045b5811..f4dffb80c271875414ad331dedf69cf3210ba47f 100644 (file)
--- a/modules/freifunk/root/etc/config/profile_leipzig
+++ b/modules/freifunk/root/etc/config/profile_leipzig
@@ -8,5 +8,7 @@ config 'community' 'profile'
        option 'latitude' '51.33348'
        option 'longitude' '12.40297'
 
+config 'defaults' 'interface'
+       option 'netmask' '255.0.0.0'
 
 

diff --git a/modules/freifunk/root/etc/config/profile_mainz b/modules/freifunk/root/etc/config/profile_mainz
index c6cd61df1e0c5ebbeac7444545ed2a1f595e1e26..2d086183e1e4c395d0e62e0a8a87d06dd0a44f3e 100644 (file)
--- a/modules/freifunk/root/etc/config/profile_mainz
+++ b/modules/freifunk/root/etc/config/profile_mainz
@@ -13,7 +13,3 @@ config 'defaults' 'wifi_iface'
 
 config 'defaults' 'wifi_device'
        option 'channel' '1'
-
-config 'defaults' 'interface'
-       option 'netmask' '255.255.0.0'
-

diff --git a/modules/freifunk/root/etc/config/profile_marburg b/modules/freifunk/root/etc/config/profile_marburg
index 21ad644e2283853f1890ef564a75a267a57aebcf..18cff80e59a2b75af8c0a0bbd870e8bcaf41d86e 100644 (file)
--- a/modules/freifunk/root/etc/config/profile_marburg
+++ b/modules/freifunk/root/etc/config/profile_marburg
@@ -10,4 +10,3 @@ config 'community' 'profile'
 
 config 'defaults' 'interface'
        option 'dns' '8.8.8.8 212.204.49.83'
-        option 'netmask' '255.255.0.0'

diff --git a/modules/freifunk/root/etc/config/profile_neuss b/modules/freifunk/root/etc/config/profile_neuss
index 5f97d879ad86f54ee3aa806ee6d2eab684c8788d..8e306173052fc0abbdd05ad58f4534daef620d58 100644 (file)
--- a/modules/freifunk/root/etc/config/profile_neuss
+++ b/modules/freifunk/root/etc/config/profile_neuss
@@ -11,8 +11,5 @@ config 'community' 'profile'
 config 'defaults' 'wifi_device'
        option 'channel' '11'
 
-config 'defaults' 'interface'
-       option 'netmask' '255.255.0.0'
-
 config 'defaults' 'wifi_iface'
        option 'bssid' 'DE:AD:BE:EF:CA:FE'

diff --git a/modules/freifunk/root/etc/config/profile_openwireless_bern b/modules/freifunk/root/etc/config/profile_openwireless_bern
index b9f5cbd76eff9ecb46a168b8ae0aa1c8e289e85e..810ad8f1cc99d300f74743104de19d45247aee91 100644 (file)
--- a/modules/freifunk/root/etc/config/profile_openwireless_bern
+++ b/modules/freifunk/root/etc/config/profile_openwireless_bern
@@ -9,7 +9,6 @@ config 'community' 'profile'
        option 'longitude' '8.769239'
 
 config 'defaults' 'interface'
-       option 'netmask' '255.255.0.0'
        option 'dns' '208.67.222.222 208.67.220.220'
 
 config 'defaults' 'wifi_device'

diff --git a/modules/freifunk/root/etc/config/profile_potsdam b/modules/freifunk/root/etc/config/profile_potsdam
index ff1d661ab12a3b211beb7fec40b6050b90a8a07e..a70a29ee545cf10c379735ad3a1a01c45e8a53b1 100644 (file)
--- a/modules/freifunk/root/etc/config/profile_potsdam
+++ b/modules/freifunk/root/etc/config/profile_potsdam
@@ -8,8 +8,5 @@ config 'community' 'profile'
        option 'latitude' '52.39349'
        option 'longitude' '13.06489'
 
-config 'defaults' 'interface'
-       option 'netmask' '255.255.0.0'
-
 config 'defaults' 'wifi_device'
        option 'channel' '13'

diff --git a/modules/freifunk/root/etc/config/profile_rosbach b/modules/freifunk/root/etc/config/profile_rosbach
index ec072811a23d24e61b304756be62854f429d082a..4444f709986c3302b583c9844d9c51d8e5045488 100644 (file)
--- a/modules/freifunk/root/etc/config/profile_rosbach
+++ b/modules/freifunk/root/etc/config/profile_rosbach
@@ -13,6 +13,3 @@ config 'defaults' 'wifi_device'
 
 config 'defaults' 'wifi_iface'
        option 'bssid' 'D2:CA:FF:EE:BA:BE'
-
-config 'defaults' 'interface'
-        option 'netmask' '255.255.0.0'

diff --git a/modules/freifunk/root/etc/config/profile_seefeld b/modules/freifunk/root/etc/config/profile_seefeld
index f88562d6f025e4c1ac2deef098f0ab3db5696e94..5d03f7d046892a0aa7dcd1d4193a958f8afe6929 100644 (file)
--- a/modules/freifunk/root/etc/config/profile_seefeld
+++ b/modules/freifunk/root/etc/config/profile_seefeld
@@ -8,9 +8,6 @@ config 'community' 'profile'
        option 'latitude' '48.03485'
        option 'longitude' '11.21279'
 
-config 'defaults' 'interface'
-       option 'netmask' '255.255.255.0'
-
 config 'defaults' 'wifi_device'
        option 'channel' '1'
        option 'bssid' '02:CA:FF:EE:BA:BB'

diff --git a/modules/freifunk/root/etc/config/profile_wlanljubljana b/modules/freifunk/root/etc/config/profile_wlanljubljana
index 9d76eeb673bf6d41f1804ebfd47c786e02073e36..eeefbd22b6ec413b5a41e3dbc84aaf97416f030d 100644 (file)
--- a/modules/freifunk/root/etc/config/profile_wlanljubljana
+++ b/modules/freifunk/root/etc/config/profile_wlanljubljana
@@ -13,4 +13,3 @@ config 'defaults' 'wifi_device'
 
 config 'defaults' 'interface'
        option 'dns' '10.254.0.1 10.254.0.2'
-       option 'netmask' '255.255.0.0'