aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2011-11-12 13:53:15 +0000
committerNicolas Thill <nico@openwrt.org>2011-11-12 13:53:15 +0000
commitb49aed152009895f69005a75d897ce321605bda6 (patch)
tree59a2cc46d24f7223757a0decf5c65a085eaaa9ae /package/base-files
parent5ad763075efc18dc60644b89e64e01897e4a6cbd (diff)
downloadupstream-b49aed152009895f69005a75d897ce321605bda6.tar.gz
upstream-b49aed152009895f69005a75d897ce321605bda6.tar.bz2
upstream-b49aed152009895f69005a75d897ce321605bda6.zip
package/base-files: enhance service functions
* allow matching process by name (useful for processes changing it) * check if first argument is executable * fix function name used in error messages SVN-Revision: 28991
Diffstat (limited to 'package/base-files')
-rwxr-xr-xpackage/base-files/files/lib/functions.sh40
1 files changed, 27 insertions, 13 deletions
diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index a89a3e91b0..f6ec3d7be6 100755
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -287,12 +287,15 @@ uci_apply_defaults() {
#
# Environment variables exposed:
# SERVICE_DAEMONIZE run EXEC in background
-# SERVICE_WRITE_PID create a pid file and use it
-# SERVICE_USE_PID assume EXEC creates its own pid file and use it
-# SERVICE_PID_FILE pid file to use (default to /var/run/EXEC.pid)
+# 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 for reloading
-# SERVICE_SIG_STOP default signal used for stopping
+# 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
@@ -305,9 +308,13 @@ 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)
@@ -315,24 +322,31 @@ service() {
;;
-S)
ssd="$ssd -S${SERVICE_DAEMONIZE:+ -b}${SERVICE_WRITE_PID:+ -m}"
+ start=1
;;
-K)
ssd="$ssd -K${SERVICE_SIG:+ -s $SERVICE_SIG}"
;;
*)
- echo "ssd: unknow action '$1'" 1>&2
+ echo "service: unknown ACTION '$1'" 1>&2
return 1
esac
shift
- if [ -z "$1" ]; then
- echo "ssd: missing arguments" 1>&2
+ exec="$1"
+ [ -n "$exec" ] || {
+ echo "service: missing argument" 1>&2
return 1
- fi
- ssd="$ssd -x $1"
- if [ -n "$SERVICE_PID_FILE$SERVICE_USE_PID$SERVICE_WRITE_PID" ]; then
- ssd="$ssd -p ${SERVICE_PID_FILE:-/var/run/${1##*/}.pid}"
- fi
+ }
+ [ -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:+ -- "$@"}
}