Attachment 392102 Details for Bug 640336

[patch] Proposed patch with more exact return codes

rc.dhcpd.diff (text/plain), 1.10 KB, created by Marius Tomaschewski on 2010-09-29 12:34:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marius Tomaschewski

Created: 2010-09-29 12:34:40 UTC

Size: 1.10 KB

patch

obsolete

>Index: rc.dhcpd
>===================================================================
>--- rc.dhcpd	(revision 788d61b0cad18a11a52cae7a32d8b926) 
>+++ rc.dhcpd	(working copy) 
>@@ -96,14 +96,33 @@
> # considered a success.
> 
> if ! [ -x "$DAEMON_BIN" ]; then
>-	if [ "$1" = "stop" ]; then exit 0; fi
>-	echo >&2 "$0: \"$DAEMON_BIN\" is not an executable file. Exiting."
>-	exit 5
>+	case $1 in
>+	stop)   ;;
>+	*)	echo -n >&2 "$0: \"$DAEMON_BIN\" is not an executable file. Exiting."
>+		case $1 in
>+		status) rc_failed 4 ;;
>+		*)	rc_failed 5 ;;
>+		esac
>+		rc_status -v
>+	;;
>+	esac
>+	rc_exit
> fi
> if ! [ -r "$DAEMON_CONF" ] ; then
>-	if [ "$1" = "stop" ]; then exit 0; fi
>-	echo >&2 "$0: \"$DAEMON_CONF\" config file missed. Exiting."
>-	exit 6
>+	case $1 in
>+	stop|status)
>+		if test ! -s /etc/sysconfig/dhcpd ; then
>+			test -e $DAEMON_STATE/$DAEMON_PIDFILE && \
>+			CHROOT_PREFIX="$DAEMON_STATE" || CHROOT_PREFIX=''
>+		fi
>+	;;
>+	*)
>+		echo -n >&2 "$0: \"$DAEMON_CONF\" config file missed. Exiting."
>+		rc_failed 6
>+		rc_status -v
>+		rc_exit
>+	;;
>+	esac
> fi
> 
> # remove empty pid files to avoid disturbing warnings by checkproc/killproc
>

Actions: View | Diff

Attachments on bug 640336: 392102