summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouke Witteveen <j.witteveen@gmail.com>2013-06-16 12:45:43 +0200
committerJouke Witteveen <j.witteveen@gmail.com>2013-06-16 12:45:43 +0200
commitfeb669f4b2a15e6ea1d84be336f12be4650f9d2d (patch)
tree44eb7ac548906d7ac07c7cded4a9b007f9854594
parent4d8cb707b1fc1947030e312c66c73fd012038c20 (diff)
downloadnetctl-feb669f4b2a15e6ea1d84be336f12be4650f9d2d.tar.gz
netctl-feb669f4b2a15e6ea1d84be336f12be4650f9d2d.tar.xz
Fix default interface bindings (third time)
The declare builtin defaults to making variables local. Previous attempts: 711c46457ae9fef52c7c529d89c67d0d526f73ef e8210827fd59e4539a70af55cb452b211633fedd
-rw-r--r--src/lib/connections/bond2
-rw-r--r--src/lib/connections/bridge6
-rw-r--r--src/lib/connections/tunnel2
-rw-r--r--src/lib/connections/tuntap2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/connections/bond b/src/lib/connections/bond
index ea56f3b..af95753 100644
--- a/src/lib/connections/bond
+++ b/src/lib/connections/bond
@@ -3,7 +3,7 @@
. "$SUBR_DIR/ip"
: ${IFENSLAVE:=ifenslave}
-declare -a BindsToInterfaces
+declare -ag BindsToInterfaces
bond_up() {
if is_interface "$Interface"; then
diff --git a/src/lib/connections/bridge b/src/lib/connections/bridge
index 56e2c84..94a9b64 100644
--- a/src/lib/connections/bridge
+++ b/src/lib/connections/bridge
@@ -3,7 +3,7 @@
. "$SUBR_DIR/ip"
: ${BRCTL:=brctl}
-declare -a BindsToInterfaces
+declare -ag BindsToInterfaces
bridge_up() {
if is_interface "$Interface"; then
@@ -30,8 +30,8 @@ bridge_up() {
bridge_down() {
for member in "${BindsToInterfaces[@]}"; do
- ip link set "$member" promisc off down
- $BRCTL delif "$Interface" "$member"
+ ip link set "$member" promisc off down
+ $BRCTL delif "$Interface" "$member"
done
ip_unset
diff --git a/src/lib/connections/tunnel b/src/lib/connections/tunnel
index 34882b2..a14f96e 100644
--- a/src/lib/connections/tunnel
+++ b/src/lib/connections/tunnel
@@ -2,7 +2,7 @@
. "$SUBR_DIR/ip"
-declare -a BindsToInterfaces
+declare -ag BindsToInterfaces
tunnel_up() {
if is_interface "$Interface"; then
diff --git a/src/lib/connections/tuntap b/src/lib/connections/tuntap
index 71a8259..149c842 100644
--- a/src/lib/connections/tuntap
+++ b/src/lib/connections/tuntap
@@ -2,7 +2,7 @@
. "$SUBR_DIR/ip"
-declare -a BindsToInterfaces
+declare -ag BindsToInterfaces
tuntap_up() {
if is_interface "$Interface"; then