projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5ae5d3b
)
contrib/package: /etc/functions.sh => /lib/functions.sh
author
Jo-Philipp Wich
<jow@openwrt.org>
Tue, 5 Jun 2012 15:57:22 +0000
(15:57 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Tue, 5 Jun 2012 15:57:22 +0000
(15:57 +0000)
15 files changed:
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/gen_bssid.sh
patch
|
blob
|
history
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/initial_config.sh
patch
|
blob
|
history
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dhcp.sh
patch
|
blob
|
history
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_dnsmasq.sh
patch
|
blob
|
history
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall.sh
patch
|
blob
|
history
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh
patch
|
blob
|
history
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_ipv6.sh
patch
|
blob
|
history
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_lan_static.sh
patch
|
blob
|
history
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_network.sh
patch
|
blob
|
history
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh
patch
|
blob
|
history
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd_interface.sh
patch
|
blob
|
history
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_splash.sh
patch
|
blob
|
history
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wan_static.sh
patch
|
blob
|
history
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh
patch
|
blob
|
history
contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
patch
|
blob
|
history
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
e05300a
..
8c9155e
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
6c442e0
..
a465935
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
d89da3a
..
5c8863e
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
504aaee
..
59b7f84
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
e14a384
..
fb2232e
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
51d20be
..
7f40f87
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
00f0706
..
1b6e0de
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
1c8c02c
..
172dcf1
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
c3647c4
..
e62cb5a
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
11ea3f1
..
1e35c64
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
f9f07aa
..
6bb490a
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
b6106de
..
9741111
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
a1bec34
..
01352d2
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
55965dc
..
84c5438
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
33ef0b0
..
4bdc2c8
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 */