Franken: Change channel to 1

Signed-off-by: Tim Niemeyer <tim.niemeyer@mastersword.de>
Franken: Change ntp server to the ipv6-ll from fff-server
2013-04-01 17:58:09 +02:00 · 2013-04-01 17:58:09 +02:00 · 2013-04-01 17:58:09 +02:00
16 changed files with 32 additions and 32 deletions
--- a/bsp/default/root_file_system/etc/config/configurator
+++ b/bsp/default/root_file_system/etc/config/configurator
@ -7,7 +7,7 @@ config 'script'
 config 'api'
 	option 'ipv4_address' '1'
 	option 'ipv6_interface' 'br-mesh'
-	option 'ipv6_address' 'fe80::201:2ff:fe03:405'
+	option 'ipv6_address' 'fe80::ff:feee:1'
 	option 'timeout' '5'
 	option 'retry' '5'

@ -20,4 +20,4 @@ config 'crawl'
 	option 'update_hash' '1'

 config 'netmon'
-	option 'autoadd_ipv6_address' '1'
+	option 'autoadd_ipv6_address' '1'
--- a/bsp/default/root_file_system/etc/config/wireless
+++ b/bsp/default/root_file_system/etc/config/wireless
@ -1,7 +1,7 @@
 config 'wifi-device' 'wifi0'
 	option 'type' 'atheros'
 	option 'disabled' '0'
-	option 'channel' '6'
+	option 'channel' '1'
 	option 'bgscan' '0'
 	option 'diversity' '1'
    option 'hwmode' '11g'
@ -10,7 +10,7 @@ config 'wifi-iface'
 	option 'device' 'wifi0'
 	option 'network' 'wlanmesh'
 	option 'mode' 'adhoc'
-	option 'ssid' 'batman.oldenburg.freifunk.net'
+	option 'ssid' 'batman.franken.freifunk.net'
 	option 'bssid' '02:CA:FF:EE:BA:BE'
 	option 'encryption' 'none'
 	option 'hidden' '1'
@ -19,5 +19,5 @@ config 'wifi-iface'
 	option 'device' 'wifi0'
 	option 'network' 'mesh'
 	option 'mode' 'ap'
-	option 'ssid' 'oldenburg.freifunk.net'
+	option 'ssid' 'franken.freifunk.net'
 	option 'encryption' 'none'
--- a/bsp/default/root_file_system/etc/fastdstart.sh
+++ b/bsp/default/root_file_system/etc/fastdstart.sh
@ -3,7 +3,7 @@
 SERVER="no"
 #SERVERNAME="--servername--"

-project="ffol"
+project="fff"

 test_internet_host1="mastersword.de"
 test_internet_host2="109.163.229.254"
@ -72,7 +72,7 @@ if ping -w5 -c3 "$test_internet_host1" &>/dev/null ||
    fi

    # register
-    wget -T15 "http://mastersword.de/~reddog/fastd/?name=$hostname&port=$port&key=$pubkey" -O /tmp/fastd_${project}_output
+    wget -T15 "http://mastersword.de/~reddog/fff/?name=$hostname&port=$port&key=$pubkey" -O /tmp/fastd_${project}_output

    filenames=$(awk '/^####/ { gsub(/^####/, "", $0); gsub(/.conf/, "", $0); print $0; }' /tmp/fastd_${project}_output)
    for file in $filenames; do
--- a/bsp/default/root_file_system/etc/rc.local
+++ b/bsp/default/root_file_system/etc/rc.local
@ -29,7 +29,7 @@ batctl if add br-ethmesh1
 batctl if add br-ethmesh2

 # Starting NTP-Client Daemon
-ntpd -p "fe80::201:2ff:fe03:405%br-mesh"
+ntpd -p "fe80::ff:feee:1%br-mesh"

 . /etc/firewall.user

--- a/bsp/dir300/root_file_system/etc/config/wireless
+++ b/bsp/dir300/root_file_system/etc/config/wireless
@ -2,14 +2,14 @@ config 'wifi-device' 'wifi0'
 	option 'type' 'mac80211'
 	option 'phy' 'phy0'
 	option 'disabled' '0'
-	option 'channel' '6'
+	option 'channel' '1'
    option 'hwmode' '11g'

 config 'wifi-iface'
 	option 'device' 'wifi0'
 	option 'network' 'wlanmesh'
 	option 'mode' 'adhoc'
-	option 'ssid' 'batman.oldenburg.freifunk.net'
+	option 'ssid' 'batman.franken.freifunk.net'
 	option 'bssid' '02:CA:FF:EE:BA:BE'
 	option 'encryption' 'none'
 	option 'hidden' '1'
@ -18,5 +18,5 @@ config 'wifi-iface'
 	option 'device' 'wifi0'
 	option 'network' 'mesh'
 	option 'mode' 'ap'
-	option 'ssid' 'oldenburg.freifunk.net'
+	option 'ssid' 'franken.freifunk.net'
 	option 'encryption' 'none'
--- a/bsp/dir300/root_file_system/etc/rc.local
+++ b/bsp/dir300/root_file_system/etc/rc.local
@ -41,7 +41,7 @@ batctl if add wlan0-1
 batctl if add eth0.3

 # Starting NTP-Client Daemon
-ntpd -p "fe80::201:2ff:fe03:405%br-mesh"
+ntpd -p "fe80::ff:feee:1%br-mesh"

 #. /etc/firewall.user

--- a/bsp/fonera/root_file_system/etc/config/wireless
+++ b/bsp/fonera/root_file_system/etc/config/wireless
@ -2,14 +2,14 @@ config 'wifi-device' 'wifi0'
 	option 'type' 'mac80211'
 	option 'phy' 'phy0'
 	option 'disabled' '0'
-	option 'channel' '6'
+	option 'channel' '1'
    option 'hwmode' '11g'

 config 'wifi-iface'
 	option 'device' 'wifi0'
 	option 'network' 'wlanmesh'
 	option 'mode' 'adhoc'
-	option 'ssid' 'batman.oldenburg.freifunk.net'
+	option 'ssid' 'batman.franken.freifunk.net'
 	option 'bssid' '02:CA:FF:EE:BA:BE'
 	option 'encryption' 'none'
 	option 'hidden' '1'
@ -18,6 +18,6 @@ config 'wifi-iface'
 	option 'device' 'wifi0'
 	option 'network' 'mesh'
 	option 'mode' 'ap'
-	option 'ssid' 'oldenburg.freifunk.net'
+	option 'ssid' 'franken.freifunk.net'
 	option 'encryption' 'none'

--- a/bsp/fonera/root_file_system/etc/rc.local
+++ b/bsp/fonera/root_file_system/etc/rc.local
@ -35,6 +35,6 @@ fi
 batctl if add wlan0-1

 # Starting NTP-Client Daemon
-ntpd -p "fe80::201:2ff:fe03:405%br-mesh"
+ntpd -p "fe80::ff:feee:1%br-mesh"

 exit 0
--- a/bsp/wr1043nd/root_file_system/etc/config/wireless
+++ b/bsp/wr1043nd/root_file_system/etc/config/wireless
@ -1,6 +1,6 @@
 config wifi-device  radio0
        option type     mac80211
-        option channel  6
+        option channel  1
 	option phy      phy0
        option hwmode   11ng
        option htmode   HT20
@ -14,7 +14,7 @@ config wifi-iface
        option network  wlanmesh
        option mode     adhoc
        option bssid    '02:CA:FF:EE:BA:BE'
-        option ssid     'batman.oldenburg.freifunk.net'
+        option ssid     'batman.franken.freifunk.net'
        option mcast_rate 6000
 #       option bintval  1000
        option 'encryption' 'none'
@ -24,5 +24,5 @@ config wifi-iface
        option device   radio0
        option network  mesh
        option mode     ap
-        option ssid     'oldenburg.freifunk.net'
+        option ssid     'franken.freifunk.net'
        option 'encryption' 'none'
--- a/bsp/wr1043nd/root_file_system/etc/rc.local
+++ b/bsp/wr1043nd/root_file_system/etc/rc.local
@ -32,7 +32,7 @@ batctl if add wlan0-1
 batctl if add eth0.3

 # Starting NTP-Client Daemon
-ntpd -p "fe80::201:2ff:fe03:405%br-mesh"
+ntpd -p "fe80::ff:feee:1%br-mesh"

 . /etc/firewall.user

--- a/bsp/wr741nd2/root_file_system/etc/config/wireless
+++ b/bsp/wr741nd2/root_file_system/etc/config/wireless
@ -1,6 +1,6 @@
 config wifi-device  radio0
        option type     mac80211
-        option channel  6
+        option channel  1
        option phy      phy0
        option hwmode   11ng

@ -9,7 +9,7 @@ config wifi-iface
        option network  wlanmesh
        option mode     adhoc
        option bssid    '02:CA:FF:EE:BA:BE'
-        option ssid     'batman.oldenburg.freifunk.net'
+        option ssid     'batman.franken.freifunk.net'
        option mcast_rate 6000
 #       option bintval  1000
        option 'encryption' 'none'
@ -19,5 +19,5 @@ config wifi-iface
        option device   radio0
        option network  mesh
        option mode     ap
-        option ssid     'oldenburg.freifunk.net'
+        option ssid     'franken.freifunk.net'
        option 'encryption' 'none'
--- a/bsp/wr741nd2/root_file_system/etc/rc.local
+++ b/bsp/wr741nd2/root_file_system/etc/rc.local
@ -32,7 +32,7 @@ batctl if add wlan0-1
 batctl if add eth0.3

 # Starting NTP-Client Daemon
-ntpd -p "fe80::201:2ff:fe03:405%br-mesh"
+ntpd -p "fe80::ff:feee:1%br-mesh"

 . /etc/firewall.user

--- a/bsp/wr741nd4/root_file_system/etc/config/wireless
+++ b/bsp/wr741nd4/root_file_system/etc/config/wireless
@ -1,6 +1,6 @@
 config wifi-device  radio0
        option type     mac80211
-        option channel  6
+        option channel  1
        option phy      phy0
        option hwmode   11ng

@ -9,7 +9,7 @@ config wifi-iface
        option network  wlanmesh
        option mode     adhoc
        option bssid    '02:CA:FF:EE:BA:BE'
-        option ssid     'batman.oldenburg.freifunk.net'
+        option ssid     'batman.franken.freifunk.net'
        option mcast_rate 6000
 #       option bintval  1000
        option 'encryption' 'none'
@ -19,5 +19,5 @@ config wifi-iface
        option device   radio0
        option network  mesh
        option mode     ap
-        option ssid     'oldenburg.freifunk.net'
+        option ssid     'franken.freifunk.net'
        option 'encryption' 'none'
--- a/bsp/wr741nd4/root_file_system/etc/rc.local
+++ b/bsp/wr741nd4/root_file_system/etc/rc.local
@ -32,7 +32,7 @@ batctl if add wlan0-1
 batctl if add eth0.3

 # Starting NTP-Client Daemon
-ntpd -p "fe80::201:2ff:fe03:405%br-mesh"
+ntpd -p "fe80::ff:feee:1%br-mesh"

 . /etc/firewall.user

--- a/bsp/wr841nd7/root_file_system/etc/config/wireless
+++ b/bsp/wr841nd7/root_file_system/etc/config/wireless
@ -1,6 +1,6 @@
 config wifi-device  radio0
        option type     mac80211
-        option channel  6
+        option channel  1
        option phy      phy0
        option hwmode   11ng

@ -9,7 +9,7 @@ config wifi-iface
        option network  wlanmesh
        option mode     adhoc
        option bssid    '02:CA:FF:EE:BA:BE'
-        option ssid     'batman.oldenburg.freifunk.net'
+        option ssid     'batman.franken.freifunk.net'
        option mcast_rate 6000
 #       option bintval  1000
        option 'encryption' 'none'
@ -19,5 +19,5 @@ config wifi-iface
        option device   radio0
        option network  mesh
        option mode     ap
-        option ssid     'oldenburg.freifunk.net'
+        option ssid     'franken.freifunk.net'
        option 'encryption' 'none'
--- a/bsp/wr841nd7/root_file_system/etc/rc.local
+++ b/bsp/wr841nd7/root_file_system/etc/rc.local
@ -32,7 +32,7 @@ batctl if add wlan0-1
 batctl if add eth0.3

 # Starting NTP-Client Daemon
-ntpd -p "fe80::201:2ff:fe03:405%br-mesh"
+ntpd -p "fe80::ff:feee:1%br-mesh"

 . /etc/firewall.user
Author	SHA1	Message	Date
Tim Niemeyer	2503f2bc26	Franken: Change channel to 1 Signed-off-by: Tim Niemeyer <tim.niemeyer@mastersword.de>	2013-04-01 17:58:09 +02:00
Tim Niemeyer	658b02f906	Franken: Change ntp server to the ipv6-ll from fff-server Signed-off-by: Tim Niemeyer <tim.niemeyer@mastersword.de>	2013-04-01 17:58:09 +02:00
Tim Niemeyer	76d7c3febb	Adapt settings for Freifunk Franken - configurator ipv6 - wireless essid - fastd key-server Signed-off-by: Tim Niemeyer <tim.niemeyer@mastersword.de>	2013-04-01 17:58:09 +02:00