diff options
| -rwxr-xr-x | package/base-files-network/files/lib/network/config.sh | 2 | ||||
| -rwxr-xr-x | package/base-files/files/etc/rc.common | 3 | ||||
| -rwxr-xr-x | package/base-files/files/lib/functions.sh | 128 | ||||
| -rw-r--r-- | package/base-files/files/lib/functions/service.sh | 129 |
4 files changed, 133 insertions, 129 deletions
diff --git a/package/base-files-network/files/lib/network/config.sh b/package/base-files-network/files/lib/network/config.sh index a58ab1edcf..5e8b05909c 100755 --- a/package/base-files-network/files/lib/network/config.sh +++ b/package/base-files-network/files/lib/network/config.sh @@ -3,6 +3,8 @@ # DEBUG="echo" +. /lib/functions/service.sh + do_sysctl() { [ -n "$2" ] && \ sysctl -n -e -w "$1=$2" >/dev/null || \ diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common index 79424a637d..f9dc83d966 100755 --- a/package/base-files/files/etc/rc.common +++ b/package/base-files/files/etc/rc.common @@ -1,7 +1,8 @@ #!/bin/sh # Copyright (C) 2006-2011 OpenWrt.org -. $IPKG_INSTROOT/etc/functions.sh +. $IPKG_INSTROOT/lib/functions.sh +. $IPKG_INSTROOT/lib/functions/service.sh initscript=$1 action=${2:-help} diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index 8c6cd07344..b3e406cba2 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -275,134 +275,6 @@ uci_apply_defaults() { uci commit } -# -# service: simple wrapper around start-stop-daemon -# -# Usage: service ACTION EXEC ARGS... -# -# Action: -# -C check if EXEC is alive -# -S start EXEC, passing it ARGS as its arguments -# -K kill EXEC, sending it a TERM signal if not specified otherwise -# -# Environment variables exposed: -# SERVICE_DAEMONIZE run EXEC in background -# SERVICE_WRITE_PID create a pid-file and use it for matching -# SERVICE_MATCH_EXEC use EXEC command-line for matching (default) -# SERVICE_MATCH_NAME use EXEC process name for matching -# SERVICE_USE_PID assume EXEC create its own pid-file and use it for matching -# SERVICE_NAME process name to use (default to EXEC file part) -# SERVICE_PID_FILE pid file to use (default to /var/run/$SERVICE_NAME.pid) -# SERVICE_SIG signal to send when using -K -# SERVICE_SIG_RELOAD default signal used when reloading -# SERVICE_SIG_STOP default signal used when stopping -# SERVICE_STOP_TIME time to wait for a process to stop gracefully before killing it -# SERVICE_UID user EXEC should be run as -# SERVICE_GID group EXEC should be run as -# -# SERVICE_DEBUG don't do anything, but show what would be done -# SERVICE_QUIET don't print anything -# - -SERVICE_QUIET=1 -SERVICE_SIG_RELOAD="HUP" -SERVICE_SIG_STOP="TERM" -SERVICE_STOP_TIME=5 -SERVICE_MATCH_EXEC=1 - -service() { - local ssd - local exec - local name - local start - ssd="${SERVICE_DEBUG:+echo }start-stop-daemon${SERVICE_QUIET:+ -q}" - case "$1" in - -C) - ssd="$ssd -K -t" - ;; - -S) - ssd="$ssd -S${SERVICE_DAEMONIZE:+ -b}${SERVICE_WRITE_PID:+ -m}" - start=1 - ;; - -K) - ssd="$ssd -K${SERVICE_SIG:+ -s $SERVICE_SIG}" - ;; - *) - echo "service: unknown ACTION '$1'" 1>&2 - return 1 - esac - shift - exec="$1" - [ -n "$exec" ] || { - echo "service: missing argument" 1>&2 - return 1 - } - [ -x "$exec" ] || { - echo "service: file '$exec' is not executable" 1>&2 - return 1 - } - name="${SERVICE_NAME:-${exec##*/}}" - [ -z "$SERVICE_USE_PID$SERVICE_WRITE_PID$SERVICE_PID_FILE" ] \ - || ssd="$ssd -p ${SERVICE_PID_FILE:-/var/run/$name.pid}" - [ -z "$SERVICE_MATCH_NAME" ] || ssd="$ssd -n $name" - ssd="$ssd${SERVICE_UID:+ -c $SERVICE_UID${SERVICE_GID:+:$SERVICE_GID}}" - [ -z "$SERVICE_MATCH_EXEC$start" ] || ssd="$ssd -x $exec" - shift - $ssd${1:+ -- "$@"} -} - -service_check() { - service -C "$@" -} - -service_signal() { - SERVICE_SIG="${SERVICE_SIG:-USR1}" service -K "$@" -} - -service_start() { - service -S "$@" -} - -service_stop() { - local try - SERVICE_SIG="${SERVICE_SIG:-$SERVICE_SIG_STOP}" service -K "$@" || return 1 - while [ $((try++)) -lt $SERVICE_STOP_TIME ]; do - service -C "$@" || return 0 - sleep 1 - done - SERVICE_SIG="KILL" service -K "$@" - sleep 1 - ! service -C "$@" -} - -service_reload() { - SERVICE_SIG="${SERVICE_SIG:-$SERVICE_SIG_RELOAD}" service -K "$@" -} - -service_kill() { - cat 1>&2 << __END_OF_WARNING__ -# -# WARNING: the 'service_kill' function is now deprecated and might be -# removed soon. Consider using the other new service_* wrappers instead. -# -__END_OF_WARNING__ - local name="${1}" - local pid="${2:-$(pidof "$name")}" - local grace="${3:-5}" - - [ -f "$pid" ] && pid="$(head -n1 "$pid" 2>/dev/null)" - - for pid in $pid; do - [ -d "/proc/$pid" ] || continue - local try=0 - kill -TERM $pid 2>/dev/null && \ - while grep -qs "$name" "/proc/$pid/cmdline" && [ $((try++)) -lt $grace ]; do sleep 1; done - kill -KILL $pid 2>/dev/null && \ - while grep -qs "$name" "/proc/$pid/cmdline"; do sleep 1; done - done -} - - group_add() { local name="$1" local gid="$2" diff --git a/package/base-files/files/lib/functions/service.sh b/package/base-files/files/lib/functions/service.sh new file mode 100644 index 0000000000..cbb717d4d0 --- /dev/null +++ b/package/base-files/files/lib/functions/service.sh @@ -0,0 +1,129 @@ +# +# service: simple wrapper around start-stop-daemon +# +# Usage: service ACTION EXEC ARGS... +# +# Action: +# -C check if EXEC is alive +# -S start EXEC, passing it ARGS as its arguments +# -K kill EXEC, sending it a TERM signal if not specified otherwise +# +# Environment variables exposed: +# SERVICE_DAEMONIZE run EXEC in background +# SERVICE_WRITE_PID create a pid-file and use it for matching +# SERVICE_MATCH_EXEC use EXEC command-line for matching (default) +# SERVICE_MATCH_NAME use EXEC process name for matching +# SERVICE_USE_PID assume EXEC create its own pid-file and use it for matching +# SERVICE_NAME process name to use (default to EXEC file part) +# SERVICE_PID_FILE pid file to use (default to /var/run/$SERVICE_NAME.pid) +# SERVICE_SIG signal to send when using -K +# SERVICE_SIG_RELOAD default signal used when reloading +# SERVICE_SIG_STOP default signal used when stopping +# SERVICE_STOP_TIME time to wait for a process to stop gracefully before killing it +# SERVICE_UID user EXEC should be run as +# SERVICE_GID group EXEC should be run as +# +# SERVICE_DEBUG don't do anything, but show what would be done +# SERVICE_QUIET don't print anything +# + +SERVICE_QUIET=1 +SERVICE_SIG_RELOAD="HUP" +SERVICE_SIG_STOP="TERM" +SERVICE_STOP_TIME=5 +SERVICE_MATCH_EXEC=1 + +service() { + local ssd + local exec + local name + local start + ssd="${SERVICE_DEBUG:+echo }start-stop-daemon${SERVICE_QUIET:+ -q}" + case "$1" in + -C) + ssd="$ssd -K -t" + ;; + -S) + ssd="$ssd -S${SERVICE_DAEMONIZE:+ -b}${SERVICE_WRITE_PID:+ -m}" + start=1 + ;; + -K) + ssd="$ssd -K${SERVICE_SIG:+ -s $SERVICE_SIG}" + ;; + *) + echo "service: unknown ACTION '$1'" 1>&2 + return 1 + esac + shift + exec="$1" + [ -n "$exec" ] || { + echo "service: missing argument" 1>&2 + return 1 + } + [ -x "$exec" ] || { + echo "service: file '$exec' is not executable" 1>&2 + return 1 + } + name="${SERVICE_NAME:-${exec##*/}}" + [ -z "$SERVICE_USE_PID$SERVICE_WRITE_PID$SERVICE_PID_FILE" ] \ + || ssd="$ssd -p ${SERVICE_PID_FILE:-/var/run/$name.pid}" + [ -z "$SERVICE_MATCH_NAME" ] || ssd="$ssd -n $name" + ssd="$ssd${SERVICE_UID:+ -c $SERVICE_UID${SERVICE_GID:+:$SERVICE_GID}}" + [ -z "$SERVICE_MATCH_EXEC$start" ] || ssd="$ssd -x $exec" + shift + $ssd${1:+ -- "$@"} +} + +service_check() { + service -C "$@" +} + +service_signal() { + SERVICE_SIG="${SERVICE_SIG:-USR1}" service -K "$@" +} + +service_start() { + service -S "$@" +} + +service_stop() { + local try + SERVICE_SIG="${SERVICE_SIG:-$SERVICE_SIG_STOP}" service -K "$@" || return 1 + while [ $((try++)) -lt $SERVICE_STOP_TIME ]; do + service -C "$@" || return 0 + sleep 1 + done + SERVICE_SIG="KILL" service -K "$@" + sleep 1 + ! service -C "$@" +} + +service_reload() { + SERVICE_SIG="${SERVICE_SIG:-$SERVICE_SIG_RELOAD}" service -K "$@" +} + +service_kill() { + cat 1>&2 << __END_OF_WARNING__ +# +# WARNING: the 'service_kill' function is now deprecated and might be +# removed soon. Consider using the other new service_* wrappers instead. +# +__END_OF_WARNING__ + local name="${1}" + local pid="${2:-$(pidof "$name")}" + local grace="${3:-5}" + + [ -f "$pid" ] && pid="$(head -n1 "$pid" 2>/dev/null)" + + for pid in $pid; do + [ -d "/proc/$pid" ] || continue + local try=0 + kill -TERM $pid 2>/dev/null && \ + while grep -qs "$name" "/proc/$pid/cmdline" && [ $((try++)) -lt $grace ]; do sleep 1; done + kill -KILL $pid 2>/dev/null && \ + while grep -qs "$name" "/proc/$pid/cmdline"; do sleep 1; done + done +} + + + |