View | Details | Raw Unified | Return to bug 7743
Collapse All | Expand All

(-)/etc/init.d/functions.orig (-2 / +22 lines)
Lines 231-240 Link Here
231
231
232
stop_daemon()
232
stop_daemon()
233
{
233
{
234
	local NAME WHICH BASENAME CMDNAME PIDFILE LOCKFILE ANNOUNCE EXPECT SIGNAL HUPSIG DEFAULT FLAGS STATUS MESSAGE
234
	local NAME WHICH BASENAME CMDNAME PIDFILE LOCKFILE ANNOUNCE EXPECT SIGNAL HUPSIG DEFAULT FLAGS STATUS MESSAGE RNAME
235
235
236
# Process options.
236
# Process options.
237
	NAME=
237
	NAME=
238
	RNAME=
238
	CMDNAME=
239
	CMDNAME=
239
	PIDFILE=
240
	PIDFILE=
240
	LOCKFILE=
241
	LOCKFILE=
Lines 257-262 Link Here
257
			CMDNAME="$1"
258
			CMDNAME="$1"
258
			shift
259
			shift
259
			;;
260
			;;
261
		--rname)
262
			shift
263
			RNAME="$1"
264
			shift
265
			;;
260
		--pidfile)
266
		--pidfile)
261
			shift
267
			shift
262
			PIDFILE="$1"
268
			PIDFILE="$1"
Lines 310-315 Link Here
310
	[ -n "$CMDNAME" ] &&
316
	[ -n "$CMDNAME" ] &&
311
		BASENAME="$(basename "$CMDNAME")" ||
317
		BASENAME="$(basename "$CMDNAME")" ||
312
		BASENAME="$(basename "$NAME")" || return 1
318
		BASENAME="$(basename "$NAME")" || return 1
319
	
320
	if [ -n "$RNAME" ]; then
321
			BASENAME="$(basename "$RNAME")"
322
	fi
313
323
314
# Try to guess the PID file if one isn't specified manually.
324
# Try to guess the PID file if one isn't specified manually.
315
	if [ -z "$PIDFILE" ]; then
325
	if [ -z "$PIDFILE" ]; then
Lines 386-395 Link Here
386
		return 1
396
		return 1
387
	fi
397
	fi
388
398
389
	local WHICH BASENAME CMDNAME PIDFILE LOCKFILE EXPECT FLAGS
399
	local WHICH BASENAME CMDNAME PIDFILE LOCKFILE EXPECT FLAGS RNAME
390
400
391
# Process options.
401
# Process options.
392
	CMDNAME=
402
	CMDNAME=
403
	RNAME=
393
	PIDFILE=
404
	PIDFILE=
394
	LOCKFILE=
405
	LOCKFILE=
395
	EXPECT=
406
	EXPECT=
Lines 404-409 Link Here
404
			CMDNAME="$1"
415
			CMDNAME="$1"
405
			shift
416
			shift
406
			;;
417
			;;
418
		--rname)
419
			shift
420
			RNAME="$1"
421
			shift
422
			;;
407
		--pidfile)
423
		--pidfile)
408
			shift
424
			shift
409
			PIDFILE="$1"
425
			PIDFILE="$1"
Lines 436-441 Link Here
436
		BASENAME="$(basename "$CMDNAME")" ||
452
		BASENAME="$(basename "$CMDNAME")" ||
437
		BASENAME="$(basename "$1")" || return 1
453
		BASENAME="$(basename "$1")" || return 1
438
454
455
	if [ -n "$RNAME" ]; then
456
			BASENAME="$(basename "$RNAME")"
457
	fi
458
439
# Try to guess the PID file if one isn't specified manually.
459
# Try to guess the PID file if one isn't specified manually.
440
	if [ -z "$PIDFILE" ]; then
460
	if [ -z "$PIDFILE" ]; then
441
		PIDFILE="/var/run/$BASENAME.pid"
461
		PIDFILE="/var/run/$BASENAME.pid"

Return to bug 7743