--- /etc/init.d/functions.orig 2005-08-22 12:05:42 +0400 +++ /etc/init.d/functions 2005-08-22 12:58:50 +0400 @@ -231,10 +231,11 @@ stop_daemon() { - local NAME WHICH BASENAME CMDNAME PIDFILE LOCKFILE ANNOUNCE EXPECT SIGNAL HUPSIG DEFAULT FLAGS STATUS MESSAGE + local NAME WHICH BASENAME CMDNAME PIDFILE LOCKFILE ANNOUNCE EXPECT SIGNAL HUPSIG DEFAULT FLAGS STATUS MESSAGE RNAME # Process options. NAME= + RNAME= CMDNAME= PIDFILE= LOCKFILE= @@ -257,6 +258,11 @@ CMDNAME="$1" shift ;; + --rname) + shift + RNAME="$1" + shift + ;; --pidfile) shift PIDFILE="$1" @@ -310,6 +316,10 @@ [ -n "$CMDNAME" ] && BASENAME="$(basename "$CMDNAME")" || BASENAME="$(basename "$NAME")" || return 1 + + if [ -n "$RNAME" ]; then + BASENAME="$(basename "$RNAME")" + fi # Try to guess the PID file if one isn't specified manually. if [ -z "$PIDFILE" ]; then @@ -386,10 +396,11 @@ return 1 fi - local WHICH BASENAME CMDNAME PIDFILE LOCKFILE EXPECT FLAGS + local WHICH BASENAME CMDNAME PIDFILE LOCKFILE EXPECT FLAGS RNAME # Process options. CMDNAME= + RNAME= PIDFILE= LOCKFILE= EXPECT= @@ -404,6 +415,11 @@ CMDNAME="$1" shift ;; + --rname) + shift + RNAME="$1" + shift + ;; --pidfile) shift PIDFILE="$1" @@ -436,6 +452,10 @@ BASENAME="$(basename "$CMDNAME")" || BASENAME="$(basename "$1")" || return 1 + if [ -n "$RNAME" ]; then + BASENAME="$(basename "$RNAME")" + fi + # Try to guess the PID file if one isn't specified manually. if [ -z "$PIDFILE" ]; then PIDFILE="/var/run/$BASENAME.pid"