More possibilities for connection scripts

This allows connection scripts to provide defaults, among other things.
joukewitteveen · Mar 22, 2013 · e821082 · e821082
1 parent c8e9661
commit e821082
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 1 deletion.
diff --git a/src/lib/connections/bond b/src/lib/connections/bond
@@ -3,6 +3,7 @@
 . "$SUBR_DIR/ip"
 
 : ${IFENSLAVE:=ifenslave}
+: ${BindsToInterfaces=}
 
 bond_up() {
     if is_interface "$Interface"; then

diff --git a/src/lib/connections/bridge b/src/lib/connections/bridge
@@ -3,6 +3,7 @@
 . "$SUBR_DIR/ip"
 
 : ${BRCTL:=brctl}
+: ${BindsToInterfaces=}
 
 bridge_up() {
     if is_interface "$Interface"; then

diff --git a/src/lib/connections/tunnel b/src/lib/connections/tunnel
@@ -2,6 +2,8 @@
 
 . "$SUBR_DIR/ip"
 
+: ${BindsToInterfaces=}
+
 tunnel_up() {
     if is_interface "$Interface"; then
         report_error "Interface '$Interface' already exists"

diff --git a/src/lib/connections/tuntap b/src/lib/connections/tuntap
@@ -2,6 +2,8 @@
 
 . "$SUBR_DIR/ip"
 
+: ${BindsToInterfaces=}
+
 tuntap_up() {
     if is_interface "$Interface"; then
         report_error "Interface '$Interface' already exists"

diff --git a/src/lib/globals b/src/lib/globals
@@ -115,6 +115,7 @@ load_profile() {
     if [[ -x "$PROFILE_DIR/interfaces/$Interface" ]]; then
         source "$PROFILE_DIR/interfaces/$Interface"
     fi
+    source "$CONN_DIR/$Connection"
 }
 
 

diff --git a/src/lib/network b/src/lib/network
@@ -48,7 +48,6 @@ cd /
 # Expose the profile name
 Profile=$2
 load_profile "$Profile"
-source "$CONN_DIR/$Connection"
 case $1 in
   start)
     report_notice "Starting network profile '$Profile'..."