X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/6338cb5b06912d6020fac98eaaaf24f0ba1dde8a..77ec3b2de9bb1880b258ec6aaf4949f146f6fd8d:/package/base-files/files/lib/functions.sh

diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index a89a3e91b..8c6cd0734 100755
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -27,7 +27,7 @@ append() {
 	local var="$1"
 	local value="$2"
 	local sep="${3:- }"
-	
+
 	eval "export ${NO_EXPORT:+-n} -- \"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\""
 }
 
@@ -74,7 +74,7 @@ package() {
 config () {
 	local cfgtype="$1"
 	local name="$2"
-	
+
 	export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=$(($CONFIG_NUM_SECTIONS + 1))
 	name="${name:-cfg$CONFIG_NUM_SECTIONS}"
 	append CONFIG_SECTIONS "$name"
@@ -110,7 +110,7 @@ config_rename() {
 	local NEW="$2"
 	local oldvar
 	local newvar
-	
+
 	[ -n "$OLD" -a -n "$NEW" ] || return
 	for oldvar in `set | grep ^CONFIG_${OLD}_ | \
 		sed -e 's/\(.*\)=.*$/\1/'` ; do
@@ -119,7 +119,7 @@ config_rename() {
 		unset "$oldvar"
 	done
 	export ${NO_EXPORT:+-n} CONFIG_SECTIONS="$(echo " $CONFIG_SECTIONS " | sed -e "s, $OLD , $NEW ,")"
-	
+
 	[ "$CONFIG_SECTION" = "$OLD" ] && export ${NO_EXPORT:+-n} CONFIG_SECTION="$NEW"
 }
 
@@ -135,8 +135,8 @@ config_clear() {
 	export ${NO_EXPORT:+-n} CONFIG_SECTIONS="${SECTION:+$CONFIG_SECTIONS}"
 
 	for oldvar in `set | grep ^CONFIG_${SECTION:+${SECTION}_} | \
-		sed -e 's/\(.*\)=.*$/\1/'` ; do 
-		unset $oldvar 
+		sed -e 's/\(.*\)=.*$/\1/'` ; do
+		unset $oldvar
 	done
 }
 
@@ -178,7 +178,7 @@ config_foreach() {
 	local type="$1"
 	[ "$#" -ge 1 ] && shift
 	local section cfgtype
-	
+
 	[ -z "$CONFIG_SECTIONS" ] && return 0
 	for section in ${CONFIG_SECTIONS}; do
 		config_get cfgtype "$section" TYPE
@@ -214,7 +214,7 @@ load_modules() {
 
 include() {
 	local file
-	
+
 	for file in $(ls $1/*.sh 2>/dev/null); do
 		. $file
 	done
@@ -223,7 +223,7 @@ include() {
 find_mtd_part() {
 	local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')"
 	local PREFIX=/dev/mtdblock
-	
+
 	PART="${PART##mtd}"
 	[ -d /dev/mtdblock ] && PREFIX=/dev/mtdblock/
 	echo "${PART:+$PREFIX$PART}"
@@ -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:+ -- "$@"}
 }
@@ -368,7 +382,7 @@ service_reload() {
 service_kill() {
 	cat 1>&2 << __END_OF_WARNING__
 #
-# WARNING: the 'service_kill' function is now deprecated and might be 
+# WARNING: the 'service_kill' function is now deprecated and might be
 # removed soon. Consider using the other new service_* wrappers instead.
 #
 __END_OF_WARNING__