contrib/package: /etc/functions.sh => /lib/functions.sh

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 e05300a0d31a67cd952dd95afecb207c31b351f9..8c9155e5e9767a9958661a6e7a40a3d37a62068c 100755 (executable)
--- 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
 
 channel=$1
 community=$2
 

-. /etc/functions.sh
+. /lib/functions.sh

 
 
 # Try to get BSSID from profile first
 
 
 # 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 6c442e0a96313af511e8e9f340d5b8b55f43bdb3..a465935fcdba734f70da93c7fa38b7fa5d2fced2 100755 (executable)
--- 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.
 
 # 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
 . $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 d89da3a5d5693c9c5144b9b4868c9fedf07b6a42..5c8863e361204293e1259c98e276e8963e0eeca9 100755 (executable)
--- 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
 
 #!/bin/sh
 # Sets up the dhcp part of dnsmasq
 

-. /etc/functions.sh
+. /lib/functions.sh

 . $dir/functions.sh
 
 net="$1"
 . $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 504aaee804360d5fe2cc2768a3614ce47b51f03a..59b7f845b0c5bc734bcd568ea963939e3fc29a11 100755 (executable)
--- 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
 
 #!/bin/sh
 

-. /etc/functions.sh
+. /lib/functions.sh

 . $dir/functions.sh
 
 # Set dnsmasq config
 . $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 e14a384e3dee3a06a08025cf64488aa5304bd8df..fb2232e9961e94ab2ad751d0966b03a7aac98119 100755 (executable)
--- 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>
 
 # 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)
 . $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 51d20bec0aaf3199d388cbbb648bacf3804485aa..7f40f87147c07f6c0da7a4ddf8d943ff754a3065 100755 (executable)
--- 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
 # Arg $1 = $net
 
 net=$1

-. /etc/functions.sh
+. /lib/functions.sh

 . $dir/functions.sh
 config_load firewall
 
 . $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 00f070682a6fcefbd13a597b22c61dfa547cfe43..1b6e0dee38b1f28c076085f16b6e1498b722be5f 100755 (executable)
--- 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
 
 
 [ ! "$(uci -q get network.lan)" == "interface" ] && exit
 

-. /etc/functions.sh
+. /lib/functions.sh

 . $dir/functions.sh
 
 # Setup IPv6 for the lan interface
 . $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 1c8c02c5ba987d127b495d0a8b402519e87471b4..172dcf138b61e7cb464c308ecaedb2a9ad6909fc 100755 (executable)
--- 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
 
 
 [ ! "$(uci -q get network.lan)" == "interface" ] && exit
 

-. /etc/functions.sh
+. /lib/functions.sh

 . $dir/functions.sh
 
 uci batch << EOF
 . $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 c3647c42dc443b1a120fc5f4809b66b70649dc07..e62cb5aa14ce799c5e6bce00084718e291be3f09 100755 (executable)
--- 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"
 # Argument $1: network interface
  
 net="$1"

-. /etc/functions.sh
+. /lib/functions.sh

 . $dir/functions.sh
 
 # Setup a (new) interface section for $net
 . $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 11ea3f17f8d0deefb119c2e52eb7bc1bed29b3dd..1e35c64647b18975a6ea1d5120f0e02d74217f5d 100755 (executable)
--- 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
 
 #!/bin/sh
 # Sets up olsrd
 

-. /etc/functions.sh
+. /lib/functions.sh

 . $dir/functions.sh
 
 # Clean the config, remove httpinfo and interface wlan
 . $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 f9f07aaa6f21d7a8eb217b46ab9585343a044b74..6bb490adfb4f320ae5e8c6fda1a4fff467a48769 100755 (executable)
--- 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
 
 
 net=$1
 

-. /etc/functions.sh
+. /lib/functions.sh

 . $dir/functions.sh
 
 # Rename interface for $netrenamed
 . $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 b6106de8768e1141167a32bb63c5b11f33ba23af..9741111257ca1bcfecbae66d9a0db062e03805ae 100755 (executable)
--- 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
 
 #!/bin/sh
 # Setup_splash, takes 1 argument: 1=net
 

-. /etc/functions.sh
+. /lib/functions.sh

 . $dir/functions.sh
 
 net=$1
 . $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 a1bec345ca57a7acac6da4fd1a15e5c1396cec6b..01352d2c189d3e9bc210d5f1ebe8f910c47badff 100755 (executable)
--- 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
 
 
 [ ! "$(uci -q get network.wan)" == "interface" ] && exit
 

-. /etc/functions.sh
+. /lib/functions.sh

 . $dir/functions.sh
 
 uci batch << EOF
 . $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 55965dc61a2fe1bdc332900949404e3ceff2b84d..84c5438ebcc08ed4898dc6c059db525b12ff0771 100755 (executable)
--- 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"
 # Arguments: $1 = network interface
 
 net="$1"

-. /etc/functions.sh
+. /lib/functions.sh

 . $dir/functions.sh
 
 ##### wifi-device #####
 . $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 33ef0b027af2640e450c0eebcffa37e8f3cc3c22..4bdc2c88f403ad3dba0772a32ca9201c24c706cf 100755 (executable)
--- 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
 
 # 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 */
 
 echo "
 /* Meshwizard 0.0.7 */