diff options
15 files changed, 15 insertions, 15 deletions
diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_bssid.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_bssid.sh index e05300a0d..8c9155e5e 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_bssid.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_bssid.sh @@ -5,7 +5,7 @@ channel=$1 community=$2 -. /etc/functions.sh +. /lib/functions.sh # Try to get BSSID from profile first diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh index 6c442e0a9..a465935fc 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh @@ -2,7 +2,7 @@ # This is only run once (usually after flashing an image from the imagebuilder) # It sets up the initial config for this node. -. /etc/functions.sh +. /lib/functions.sh . $dir/functions.sh config_load system diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh index d89da3a5d..5c8863e36 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh @@ -1,7 +1,7 @@ #!/bin/sh # Sets up the dhcp part of dnsmasq -. /etc/functions.sh +. /lib/functions.sh . $dir/functions.sh net="$1" diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dnsmasq.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dnsmasq.sh index 504aaee80..59b7f845b 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dnsmasq.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dnsmasq.sh @@ -1,6 +1,6 @@ #!/bin/sh -. /etc/functions.sh +. /lib/functions.sh . $dir/functions.sh # Set dnsmasq config diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall.sh index e14a384e3..fb2232e99 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall.sh @@ -3,7 +3,7 @@ # If wan/lan is used for olsr then remove these networks from wan/lan zones # Also setup rules defined in /etc/config/freifunk and /etc/config/profile_<community> -. /etc/functions.sh +. /lib/functions.sh . $dir/functions.sh wan_is_olsr=$(uci -q get meshwizard.netconfig.wan_config) diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh index 51d20bec0..7f40f8714 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh @@ -4,7 +4,7 @@ # Arg $1 = $net net=$1 -. /etc/functions.sh +. /lib/functions.sh . $dir/functions.sh config_load firewall diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_ipv6.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_ipv6.sh index 00f070682..1b6e0dee3 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_ipv6.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_ipv6.sh @@ -2,7 +2,7 @@ [ ! "$(uci -q get network.lan)" == "interface" ] && exit -. /etc/functions.sh +. /lib/functions.sh . $dir/functions.sh # Setup IPv6 for the lan interface diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_static.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_static.sh index 1c8c02c5b..172dcf138 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_static.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_static.sh @@ -3,7 +3,7 @@ [ ! "$(uci -q get network.lan)" == "interface" ] && exit -. /etc/functions.sh +. /lib/functions.sh . $dir/functions.sh uci batch << EOF diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_network.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_network.sh index c3647c42d..e62cb5aa1 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_network.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_network.sh @@ -2,7 +2,7 @@ # Argument $1: network interface net="$1" -. /etc/functions.sh +. /lib/functions.sh . $dir/functions.sh # Setup a (new) interface section for $net diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh index 11ea3f17f..1e35c6464 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh @@ -1,7 +1,7 @@ #!/bin/sh # Sets up olsrd -. /etc/functions.sh +. /lib/functions.sh . $dir/functions.sh # Clean the config, remove httpinfo and interface wlan diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd_interface.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd_interface.sh index f9f07aaa6..6bb490adf 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd_interface.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd_interface.sh @@ -4,7 +4,7 @@ net=$1 -. /etc/functions.sh +. /lib/functions.sh . $dir/functions.sh # Rename interface for $netrenamed diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh index b6106de87..974111125 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh @@ -1,7 +1,7 @@ #!/bin/sh # Setup_splash, takes 1 argument: 1=net -. /etc/functions.sh +. /lib/functions.sh . $dir/functions.sh net=$1 diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_static.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_static.sh index a1bec345c..01352d2c1 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_static.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_static.sh @@ -3,7 +3,7 @@ [ ! "$(uci -q get network.wan)" == "interface" ] && exit -. /etc/functions.sh +. /lib/functions.sh . $dir/functions.sh uci batch << EOF 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 55965dc61..84c5438eb 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 @@ -3,7 +3,7 @@ # Arguments: $1 = network interface net="$1" -. /etc/functions.sh +. /lib/functions.sh . $dir/functions.sh ##### wifi-device ##### diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh index 33ef0b027..4bdc2c88f 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh @@ -9,7 +9,7 @@ # You may not use this file except in compliance with the License. # You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 -. /etc/functions.sh +. /lib/functions.sh echo " /* Meshwizard 0.0.7 */ |