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

(-)rc.syslog.old (-14 / +24 lines)
Lines 59-68 Link Here
59
    echo 1>&2 "${klog_bin} is not installed"
59
    echo 1>&2 "${klog_bin} is not installed"
60
    if test "$1" == "stop" ; then exit 0 ; else exit 5 ; fi
60
    if test "$1" == "stop" ; then exit 0 ; else exit 5 ; fi
61
}
61
}
62
test -s /var/lock/subsys/syslogd && {
62
test -s /var/lock/subsys/syslog && {
63
    read -t 5 syslog_use < /var/lock/subsys/syslogd
63
    read -t 5 syslog_use < /var/lock/subsys/syslog
64
}
64
}
65
test -z "$syslog_use" && syslog_use=${syslog_bin}
65
test -z "$syslog_use" && syslog_use=${syslog_bin}
66
syslog_run_pid="/var/run/"$(basename ${syslog_use})".pid"
66
67
67
#
68
#
68
# Do not translate symbol addresses for 2.6 kernel
69
# Do not translate symbol addresses for 2.6 kernel
Lines 96-103 Link Here
96
	if test -s /var/run/klogd.pid ; then
97
	if test -s /var/run/klogd.pid ; then
97
	    killproc ${klog_bin}
98
	    killproc ${klog_bin}
98
	fi
99
	fi
99
	if test -s ${syslog_pid} ; then
100
	if test -s ${syslog_run_pid} ; then
100
	    killproc -p ${syslog_pid} ${syslog_use}
101
	    killproc -p ${syslog_run_pid} ${syslog_use}
102
	    echo -n "Re-"
103
	    rm -f /var/lock/subsys/syslog
104
	elif test "${syslog_run_pid}" != "${syslog_pid}" && \
105
	     test -s ${syslog_pid}   ; then
106
	    killproc -p ${syslog_pid} ${syslog_bin}
101
	    echo -n "Re-"
107
	    echo -n "Re-"
102
	fi
108
	fi
103
	echo -n "Starting syslog services"
109
	echo -n "Starting syslog services"
Lines 107-113 Link Here
107
	rc_status
113
	rc_status
108
114
109
	# Remember the currently used syslog daemon
115
	# Remember the currently used syslog daemon
110
	echo ${syslog_bin} > /var/lock/subsys/syslogd
116
	echo ${syslog_bin} > /var/lock/subsys/syslog
111
117
112
	if test $? -eq 0 ; then
118
	if test $? -eq 0 ; then
113
	    startproc ${klog_bin} -c $KERNEL_LOGLEVEL $KLOGD_PARAMS
119
	    startproc ${klog_bin} -c $KERNEL_LOGLEVEL $KLOGD_PARAMS
Lines 120-128 Link Here
120
	test "$2" = "early" && exit 0
126
	test "$2" = "early" && exit 0
121
127
122
	echo -n "Shutting down syslog services"
128
	echo -n "Shutting down syslog services"
123
	killproc		  -TERM ${klog_bin}   ; rc_status
129
	killproc		      -TERM ${klog_bin}   ; rc_status
124
	killproc -p ${syslog_pid} -TERM ${syslog_use} ; rc_status -v
130
	killproc -p ${syslog_run_pid} -TERM ${syslog_use} ; rc_status -v
125
	rm -f /var/lock/subsys/syslogd
131
	rm -f /var/lock/subsys/syslog
126
	;;
132
	;;
127
    try-restart|condrestart)
133
    try-restart|condrestart)
128
	if test "$1" = "condrestart"; then
134
	if test "$1" = "condrestart"; then
Lines 143-160 Link Here
143
	;;
149
	;;
144
    reload|force-reload)
150
    reload|force-reload)
145
	echo -n "Reload syslog service"
151
	echo -n "Reload syslog service"
146
	killproc		  -TSTP ${klog_bin}   ; rc_status
152
	killproc		      -TSTP ${klog_bin}   ; rc_status
147
	killproc -p ${syslog_pid} -HUP  ${syslog_use} ; rc_status
153
	killproc -p ${syslog_run_pid} -HUP  ${syslog_use} ; rc_status
148
	killproc		  -CONT ${klog_bin}   ; rc_status
154
	killproc		      -CONT ${klog_bin}   ; rc_status
149
	killproc		  -USR2 ${klog_bin}   ; rc_status -v
155
	killproc		      -USR2 ${klog_bin}   ; rc_status -v
150
	;;
156
	;;
151
    status)
157
    status)
152
	echo -n "Checking for service syslog:"
158
	echo -n "Checking for service syslog:"
153
	checkproc		  	${klog_bin}   ; rc_status
159
	checkproc		  	${klog_bin}   ; rc_status
154
	checkproc -p ${syslog_pid}	${syslog_use} ; rc_status -v
160
	checkproc -p ${syslog_run_pid}	${syslog_use} ; rc_status -v
155
	;;
161
	;;
156
    probe)
162
    probe)
157
	test ${config} -nt ${syslog_pid} && echo reload
163
	if test "${syslog_run_pid}" != "${syslog_pid}" ; then
164
	    echo restart
165
	else
166
	    test ${config} -nt ${syslog_run} && echo reload
167
	fi
158
	;;
168
	;;
159
    *)
169
    *)
160
	echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
170
	echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"

Return to bug 166933