summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouke Witteveen <j.witteveen@gmail.com>2014-02-25 14:37:54 +0100
committerJouke Witteveen <j.witteveen@gmail.com>2014-02-25 15:21:08 +0100
commit05959bbbae46724d9abe1c32ca69eaaf2ca20722 (patch)
tree7bc1b9de26cde08b314fab5641dc64440500fec6
parent3931048281b7bbe80d21ce84a7234db0c7931271 (diff)
downloadnetctl-05959bbbae46724d9abe1c32ca69eaaf2ca20722.tar.gz
netctl-05959bbbae46724d9abe1c32ca69eaaf2ca20722.tar.xz
Remove CONN_DIR variable
It is not of much use.
-rw-r--r--src/lib/connections/vlan3
-rw-r--r--src/lib/globals5
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/connections/vlan b/src/lib/connections/vlan
index ff37d81..e9ab08b 100644
--- a/src/lib/connections/vlan
+++ b/src/lib/connections/vlan
@@ -1,6 +1,6 @@
# Contributed by: Thomas S Hatch <thatch45@gmail.com>
-. "$CONN_DIR/ethernet"
+. "$SUBR_DIR/connections/ethernet"
vlan_up() {
if [[ ${#BindsToInterfaces[@]} -ne 1 ]]; then
@@ -23,4 +23,5 @@ vlan_down() {
ip link delete "$Interface"
}
+
# vim: ft=sh ts=4 et sw=4:
diff --git a/src/lib/globals b/src/lib/globals
index f31beac..cf99575 100644
--- a/src/lib/globals
+++ b/src/lib/globals
@@ -1,7 +1,6 @@
NETCTL_VERSION="notpackaged"
PROFILE_DIR="/etc/netctl"
SUBR_DIR="/usr/lib/network"
-CONN_DIR="$SUBR_DIR/connections"
STATE_DIR="/run/network"
STATE_FILE="${NETCTL_STATE_FILE:-/var/lib/netctl/netctl.state}"
@@ -117,13 +116,13 @@ load_profile() {
if [[ -z $Interface ]]; then
exit_error "Profile '$1' does not specify an interface"
fi
- if [[ ! -r "${Connection:+$CONN_DIR/$Connection}" ]]; then
+ if [[ ! -r "${Connection:+$SUBR_DIR/connections/$Connection}" ]]; then
exit_error "Profile '$1' does not specify a valid connection"
fi
if [[ -x "$PROFILE_DIR/interfaces/$Interface" ]]; then
source "$PROFILE_DIR/interfaces/$Interface"
fi
- source "$CONN_DIR/$Connection"
+ source "$SUBR_DIR/connections/$Connection"
}