Commit 05959bbb authored by Jouke Witteveen's avatar Jouke Witteveen
Browse files

Remove CONN_DIR variable

It is not of much use.
parent 39310482
# Contributed by: Thomas S Hatch <thatch45@gmail.com> # Contributed by: Thomas S Hatch <thatch45@gmail.com>
. "$CONN_DIR/ethernet" . "$SUBR_DIR/connections/ethernet"
vlan_up() { vlan_up() {
if [[ ${#BindsToInterfaces[@]} -ne 1 ]]; then if [[ ${#BindsToInterfaces[@]} -ne 1 ]]; then
...@@ -23,4 +23,5 @@ vlan_down() { ...@@ -23,4 +23,5 @@ vlan_down() {
ip link delete "$Interface" ip link delete "$Interface"
} }
# vim: ft=sh ts=4 et sw=4: # vim: ft=sh ts=4 et sw=4:
NETCTL_VERSION="notpackaged" NETCTL_VERSION="notpackaged"
PROFILE_DIR="/etc/netctl" PROFILE_DIR="/etc/netctl"
SUBR_DIR="/usr/lib/network" SUBR_DIR="/usr/lib/network"
CONN_DIR="$SUBR_DIR/connections"
STATE_DIR="/run/network" STATE_DIR="/run/network"
STATE_FILE="${NETCTL_STATE_FILE:-/var/lib/netctl/netctl.state}" STATE_FILE="${NETCTL_STATE_FILE:-/var/lib/netctl/netctl.state}"
...@@ -117,13 +116,13 @@ load_profile() { ...@@ -117,13 +116,13 @@ load_profile() {
if [[ -z $Interface ]]; then if [[ -z $Interface ]]; then
exit_error "Profile '$1' does not specify an interface" exit_error "Profile '$1' does not specify an interface"
fi 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" exit_error "Profile '$1' does not specify a valid connection"
fi fi
if [[ -x "$PROFILE_DIR/interfaces/$Interface" ]]; then if [[ -x "$PROFILE_DIR/interfaces/$Interface" ]]; then
source "$PROFILE_DIR/interfaces/$Interface" source "$PROFILE_DIR/interfaces/$Interface"
fi fi
source "$CONN_DIR/$Connection" source "$SUBR_DIR/connections/$Connection"
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment