Attachment 111266 Details for Bug 166933

[patch] proposed fix

rc.syslog.dif (text/plain), 2.79 KB, created by Marius Tomaschewski on 2007-01-02 13:42:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marius Tomaschewski

Created: 2007-01-02 13:42:02 UTC

Size: 2.79 KB

patch

obsolete

>--- rc.syslog.old	2007-01-02 13:35:58.000000000 +0100
>+++ rc.syslog	2007-01-02 14:40:20.000000000 +0100
>@@ -59,10 +59,11 @@
>     echo 1>&2 "${klog_bin} is not installed"
>     if test "$1" == "stop" ; then exit 0 ; else exit 5 ; fi
> }
>-test -s /var/lock/subsys/syslogd && {
>-    read -t 5 syslog_use < /var/lock/subsys/syslogd
>+test -s /var/lock/subsys/syslog && {
>+    read -t 5 syslog_use < /var/lock/subsys/syslog
> }
> test -z "$syslog_use" && syslog_use=${syslog_bin}
>+syslog_run_pid="/var/run/"$(basename ${syslog_use})".pid"
> 
> #
> # Do not translate symbol addresses for 2.6 kernel
>@@ -96,8 +97,13 @@
> 	if test -s /var/run/klogd.pid ; then
> 	    killproc ${klog_bin}
> 	fi
>-	if test -s ${syslog_pid} ; then
>-	    killproc -p ${syslog_pid} ${syslog_use}
>+	if test -s ${syslog_run_pid} ; then
>+	    killproc -p ${syslog_run_pid} ${syslog_use}
>+	    echo -n "Re-"
>+	    rm -f /var/lock/subsys/syslog
>+	elif test "${syslog_run_pid}" != "${syslog_pid}" && \
>+	     test -s ${syslog_pid}   ; then
>+	    killproc -p ${syslog_pid} ${syslog_bin}
> 	    echo -n "Re-"
> 	fi
> 	echo -n "Starting syslog services"
>@@ -107,7 +113,7 @@
> 	rc_status
> 
> 	# Remember the currently used syslog daemon
>-	echo ${syslog_bin} > /var/lock/subsys/syslogd
>+	echo ${syslog_bin} > /var/lock/subsys/syslog
> 
> 	if test $? -eq 0 ; then
> 	    startproc ${klog_bin} -c $KERNEL_LOGLEVEL $KLOGD_PARAMS
>@@ -120,9 +126,9 @@
> 	test "$2" = "early" && exit 0
> 
> 	echo -n "Shutting down syslog services"
>-	killproc		  -TERM ${klog_bin}   ; rc_status
>-	killproc -p ${syslog_pid} -TERM ${syslog_use} ; rc_status -v
>-	rm -f /var/lock/subsys/syslogd
>+	killproc		      -TERM ${klog_bin}   ; rc_status
>+	killproc -p ${syslog_run_pid} -TERM ${syslog_use} ; rc_status -v
>+	rm -f /var/lock/subsys/syslog
> 	;;
>     try-restart|condrestart)
> 	if test "$1" = "condrestart"; then
>@@ -143,18 +149,22 @@
> 	;;
>     reload|force-reload)
> 	echo -n "Reload syslog service"
>-	killproc		  -TSTP ${klog_bin}   ; rc_status
>-	killproc -p ${syslog_pid} -HUP  ${syslog_use} ; rc_status
>-	killproc		  -CONT ${klog_bin}   ; rc_status
>-	killproc		  -USR2 ${klog_bin}   ; rc_status -v
>+	killproc		      -TSTP ${klog_bin}   ; rc_status
>+	killproc -p ${syslog_run_pid} -HUP  ${syslog_use} ; rc_status
>+	killproc		      -CONT ${klog_bin}   ; rc_status
>+	killproc		      -USR2 ${klog_bin}   ; rc_status -v
> 	;;
>     status)
> 	echo -n "Checking for service syslog:"
> 	checkproc		  	${klog_bin}   ; rc_status
>-	checkproc -p ${syslog_pid}	${syslog_use} ; rc_status -v
>+	checkproc -p ${syslog_run_pid}	${syslog_use} ; rc_status -v
> 	;;
>     probe)
>-	test ${config} -nt ${syslog_pid} && echo reload
>+	if test "${syslog_run_pid}" != "${syslog_pid}" ; then
>+	    echo restart
>+	else
>+	    test ${config} -nt ${syslog_run} && echo reload
>+	fi
> 	;;
>     *)
> 	echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"

Actions: View | Diff

Attachments on bug 166933: 111266