diff options
Diffstat (limited to 'contrib/package')
8 files changed, 18 insertions, 38 deletions
diff --git a/contrib/package/community-profiles/files/etc/config/profile_aachen b/contrib/package/community-profiles/files/etc/config/profile_aachen deleted file mode 100644 index cc643e131..000000000 --- a/contrib/package/community-profiles/files/etc/config/profile_aachen +++ /dev/null @@ -1,10 +0,0 @@ -config 'community' 'profile' - option 'name' 'Aachen' - option 'homepage' 'http://aachen.freifunk.net' - option 'ssid' 'aachen.freifunk.net' - option 'suffix' 'ffac' - option 'latitude' '50.77900' - option 'longitude' '6.05399' - option 'mesh_network' '10.90.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '28' diff --git a/contrib/package/community-profiles/files/etc/config/profile_augsburg b/contrib/package/community-profiles/files/etc/config/profile_augsburg index 0bbafcaea..4434b0fba 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_augsburg +++ b/contrib/package/community-profiles/files/etc/config/profile_augsburg @@ -13,10 +13,7 @@ config 'community' 'profile' option 'ipv6' '1' option 'ipv6_config' 'auto-ipv6-fromv4' option 'ipv6_prefix' 'fdca:ffee:ffa::/48' - option 'extrapackages' 'luci-app-owm luci-app-owm-ant luci-app-owm-cmd luci-app-owm-gui' - list 'owm_api' 'http://api.openwifimap.net' - list 'owm_api' 'http://owmapi.pberg.freifunk.net' - option 'mapserver' 'http://openwifimap.net/' + #option 'extrapackages' '' config 'defaults' 'interface' option 'netmask' '255.255.192.0' diff --git a/contrib/package/community-profiles/files/etc/config/profile_demo b/contrib/package/community-profiles/files/etc/config/profile_demo index d32234961..c11a74f26 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_demo +++ b/contrib/package/community-profiles/files/etc/config/profile_demo @@ -11,10 +11,7 @@ config 'community' 'profile' option 'ipv6' '1' option 'ipv6_config' 'auto-ipv6-fromv4' option 'ipv6_prefix' 'fdca:ffff:ffff::/48' - option 'extrapackages' 'luci-app-owm luci-app-owm-ant luci-app-owm-cmd luci-app-owm-gui' - list 'owm_api' 'http://api.openwifimap.net' - list 'owm_api' 'http://owmapi.pberg.freifunk.net' - option 'mapserver' 'http://openwifimap.net/' + #option 'extrapackages' '' config 'defaults' 'interface' option 'netmask' '255.255.255.0' diff --git a/contrib/package/community-profiles/files/etc/config/profile_neuss b/contrib/package/community-profiles/files/etc/config/profile_neuss deleted file mode 100644 index 8e3061730..000000000 --- a/contrib/package/community-profiles/files/etc/config/profile_neuss +++ /dev/null @@ -1,15 +0,0 @@ -config 'community' 'profile' - option 'name' 'Freifunk Neuss' - option 'homepage' 'http://neuss.freifunk.net' - option 'ssid' 'neuss.freifunk.net' - option 'mesh_network' '172.28.0.0/16' - option 'splash_network' '10.104.0.0/16' - option 'splash_prefix' '27' - option 'latitude' '51.19045' - option 'longitude' '6.69471' - -config 'defaults' 'wifi_device' - option 'channel' '11' - -config 'defaults' 'wifi_iface' - option 'bssid' 'DE:AD:BE:EF:CA:FE' diff --git a/contrib/package/community-profiles/files/etc/config/profile_potsdam b/contrib/package/community-profiles/files/etc/config/profile_potsdam index bde824f35..c15624a9f 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_potsdam +++ b/contrib/package/community-profiles/files/etc/config/profile_potsdam @@ -13,3 +13,7 @@ config 'defaults' 'wifi_device' config 'defaults' 'bssidscheme' option '5' '02:CA:FF:EE:BA:BE' + +config 'defaults' 'interface' + option 'dns' '85.214.20.141 213.73.91.35 194.150.168.168' + diff --git a/contrib/package/freifunk-common/files/etc/config/freifunk b/contrib/package/freifunk-common/files/etc/config/freifunk index c55fe0aff..9a46f056a 100644 --- a/contrib/package/freifunk-common/files/etc/config/freifunk +++ b/contrib/package/freifunk-common/files/etc/config/freifunk @@ -96,17 +96,19 @@ config 'defaults' 'wifi_device' option 'diversity' '1' option 'disabled' '0' option 'country' 'DE' - option 'hwmode' '11g' option 'distance' '1000' config 'defaults' 'wifi_iface' option 'mode' 'adhoc' option 'encryption' 'none' - option 'bgscan' '0' option 'bssid' '12:CA:FF:EE:BA:BE' + option 'mcast_rate' '6000' + +config 'defaults' 'madwifi_wifi_iface' + option 'bgscan' '0' option 'sw_merge' '1' - option 'mcast_rate' '5500' - option 'probereq' '1' + option 'probereq' '1' + option 'mcast_rate' '5500' config 'defaults' 'interface' option 'netmask' '255.255.0.0' diff --git a/contrib/package/meshwizard/Makefile b/contrib/package/meshwizard/Makefile index 45d5f2162..9d74fe547 100644 --- a/contrib/package/meshwizard/Makefile +++ b/contrib/package/meshwizard/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=meshwizard -PKG_RELEASE:=0.1.0 +PKG_RELEASE:=0.1.1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh index 707b7b72c..41feb8665 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh @@ -59,6 +59,11 @@ uci set wireless.$net\_iface=wifi-iface # create new wifi-iface for $net from defaults set_defaults "wifi_iface_" wireless.$net\_iface +# overwrite some settings for type atheros (madwifi) +if [ "$type" = "atheros" ]; then + set_defaults "madwifi_wifi_iface_" wireless.${net} +fi + # overwrite defaults bssid="$($dir/helpers/gen_bssid.sh $channel $community)" |