Commit ae4adf79 authored by Jim Pryor's avatar Jim Pryor Committed by James Rayner
Browse files

load hooks only from /usr/lib/network/hooks



Signed-off-by: default avatarJim Pryor <profjim@jimpryor.net>
parent 06f6fab0
### Sample netcfg hook script for logging/debugging connections ### Sample netcfg hook script for logging/debugging connections
### To install, make this executable and put it in /etc/network.d/hooks ### To install, make this executable and put it in /usr/lib/network/hooks
. /etc/rc.conf . /etc/rc.conf
......
# /usr/lib/networks/globals # /usr/lib/networks/globals
# #
# any +x files in /usr/lib/network/hooks and /etc/network.d/hooks # any +x files in /usr/lib/network/hooks
# will be sourced when this file is. # will be sourced when this file is.
# hook files can override any of the utility functions defined here for custom behavior # hook files can override any of the utility functions defined here for custom behavior
# (such as logging error messages to syslog) # (such as logging error messages to syslog)
...@@ -10,10 +10,9 @@ ...@@ -10,10 +10,9 @@
### Globals ### Globals
PROFILE_DIR="/etc/network.d/" PROFILE_DIR="/etc/network.d/"
HOOKS_DIR="/usr/lib/network/hooks/"
USERHOOKS_DIR="$PROFILE_DIR/hooks/"
IFACE_DIR="$PROFILE_DIR/interfaces/" IFACE_DIR="$PROFILE_DIR/interfaces/"
SUBR_DIR="/usr/lib/network/" SUBR_DIR="/usr/lib/network/"
HOOKS_DIR="${SUBR_DIR}/hooks/"
CONN_DIR="${SUBR_DIR}/connections/" CONN_DIR="${SUBR_DIR}/connections/"
STATE_DIR="/var/run/network/" STATE_DIR="/var/run/network/"
...@@ -109,13 +108,8 @@ checkyesno() ...@@ -109,13 +108,8 @@ checkyesno()
function load_hooks() { function load_hooks() {
### Load any +x files in $HOOKS_DIR and $USERHOOKS_DIR ### Load any +x files in $HOOKS_DIR and $USERHOOKS_DIR
local hook local hook
for hook in $(find -L "$HOOKS_DIR/" "$USERHOOKS_DIR/$hook" -maxdepth 1 -type f -executable -printf '%P\n' | sort -u); do for hook in $(find -L "$HOOKS_DIR/" -maxdepth 1 -type f -executable | sort -u); do
# if there's an executable hook of this name in USERHOOKS_DIR, we only load it source "$hook"
if [ -x "$USERHOOKS_DIR/$hook" ]; then
source "$USERHOOKS_DIR/$hook"
else
source "$HOOKS_DIR/$hook"
fi
done done
} }
......
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