diff options
author | Jouke Witteveen <j.witteveen@gmail.com> | 2013-03-22 12:07:53 +0100 |
---|---|---|
committer | Jouke Witteveen <j.witteveen@gmail.com> | 2013-03-22 12:07:53 +0100 |
commit | e8210827fd59e4539a70af55cb452b211633fedd (patch) | |
tree | 541197d57b0a222bb13e821bbde58793be0e26d7 | |
parent | c8e96611f141dd14ba0a6e8924e2951852401d8e (diff) | |
download | netctl-e8210827fd59e4539a70af55cb452b211633fedd.tar.gz netctl-e8210827fd59e4539a70af55cb452b211633fedd.tar.xz |
More possibilities for connection scripts
This allows connection scripts to provide defaults, among other things.
-rw-r--r-- | src/lib/connections/bond | 1 | ||||
-rw-r--r-- | src/lib/connections/bridge | 1 | ||||
-rw-r--r-- | src/lib/connections/tunnel | 2 | ||||
-rw-r--r-- | src/lib/connections/tuntap | 2 | ||||
-rw-r--r-- | src/lib/globals | 1 | ||||
-rwxr-xr-x | src/lib/network | 1 |
6 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/connections/bond b/src/lib/connections/bond index 379e272..bd45b2f 100644 --- 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 index f33295d..11552ce 100644 --- 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 index f202371..76b6b5f 100644 --- 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 index 1ff5203..b0cfa7e 100644 --- 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 index 125d04c..bfb4575 100644 --- 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 index bc11da7..6ac9d75 100755 --- 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'..." |