|
Lines 96-103
Link Here
|
| 96 |
test "$1" == "stop" && exit 0 |
96 |
test "$1" == "stop" && exit 0 |
| 97 |
exit 5 |
97 |
exit 5 |
| 98 |
} |
98 |
} |
| 99 |
test -s /var/lock/syslogd && { |
99 |
test -s /var/lock/subsys/syslogd && { |
| 100 |
read -t 5 syslog_use < /var/lock/syslogd |
100 |
read -t 5 syslog_use < /var/lock/subsys/syslogd |
| 101 |
} |
101 |
} |
| 102 |
test -z "$syslog_use" && syslog_use=${syslog_bin} |
102 |
test -z "$syslog_use" && syslog_use=${syslog_bin} |
| 103 |
syslog_use_pid="/var/run/${syslog_use##*\/}.pid" |
103 |
syslog_use_pid="/var/run/${syslog_use##*\/}.pid" |
|
Lines 117-132
Link Here
|
| 117 |
rc_reset |
117 |
rc_reset |
| 118 |
case "$1" in |
118 |
case "$1" in |
| 119 |
start) |
119 |
start) |
| 120 |
if test -e /var/lock/earlysyslog ; then |
120 |
if test -e /var/lock/subsys/earlysyslog ; then |
| 121 |
# Syslog service already done |
121 |
# Syslog service already done |
| 122 |
rm -f /var/lock/earlysyslog |
122 |
rm -f /var/lock/subsys/earlysyslog |
| 123 |
case "$SYSLOG_DAEMON" in |
123 |
case "$SYSLOG_DAEMON" in |
| 124 |
rsyslogd) ;; # switch to normal config |
124 |
rsyslogd) ;; # switch to normal config |
| 125 |
*) exit 0 ;; |
125 |
*) exit 0 ;; |
| 126 |
esac |
126 |
esac |
| 127 |
elif test "$2" = "early" ; then |
127 |
elif test "$2" = "early" ; then |
| 128 |
# Start syslog service early |
128 |
# Start syslog service early |
| 129 |
> /var/lock/earlysyslog |
129 |
> /var/lock/subsys/earlysyslog |
| 130 |
fi |
130 |
fi |
| 131 |
|
131 |
|
| 132 |
if ! test -e /dev/xconsole ; then |
132 |
if ! test -e /dev/xconsole ; then |
|
Lines 137-143
Link Here
|
| 137 |
if test -s ${syslog_use_pid} ; then |
137 |
if test -s ${syslog_use_pid} ; then |
| 138 |
killproc -p ${syslog_use_pid} ${syslog_use} |
138 |
killproc -p ${syslog_use_pid} ${syslog_use} |
| 139 |
echo -n "Re-" |
139 |
echo -n "Re-" |
| 140 |
rm -f /var/lock/syslogd |
140 |
rm -f /var/lock/subsys/syslogd |
| 141 |
fi |
141 |
fi |
| 142 |
echo -n "Starting syslog services" |
142 |
echo -n "Starting syslog services" |
| 143 |
test -z "$KERNEL_LOGLEVEL" && KERNEL_LOGLEVEL=1 |
143 |
test -z "$KERNEL_LOGLEVEL" && KERNEL_LOGLEVEL=1 |
|
Lines 181-187
Link Here
|
| 181 |
rc_status |
181 |
rc_status |
| 182 |
|
182 |
|
| 183 |
# Remember the currently used syslog daemon |
183 |
# Remember the currently used syslog daemon |
| 184 |
echo ${syslog_bin} > /var/lock/syslogd |
184 |
echo ${syslog_bin} > /var/lock/subsys/syslogd |
| 185 |
|
185 |
|
| 186 |
if test $? -eq 0 ; then |
186 |
if test $? -eq 0 ; then |
| 187 |
if test "$start_klogd" = yes ; then |
187 |
if test "$start_klogd" = yes ; then |
|
Lines 192-198
Link Here
|
| 192 |
rc_status -v |
192 |
rc_status -v |
| 193 |
;; |
193 |
;; |
| 194 |
stop) |
194 |
stop) |
| 195 |
rm -f /var/lock/earlysyslog |
195 |
rm -f /var/lock/subsys/earlysyslog |
| 196 |
test "$2" = "early" && exit 0 |
196 |
test "$2" = "early" && exit 0 |
| 197 |
|
197 |
|
| 198 |
echo -n "Shutting down syslog services" |
198 |
echo -n "Shutting down syslog services" |
|
Lines 202-208
Link Here
|
| 202 |
killproc ${klog_bin} |
202 |
killproc ${klog_bin} |
| 203 |
fi |
203 |
fi |
| 204 |
killproc -p ${syslog_use_pid} ${syslog_use} ; rc_status -v |
204 |
killproc -p ${syslog_use_pid} ${syslog_use} ; rc_status -v |
| 205 |
rm -f /var/lock/syslogd |
205 |
rm -f /var/lock/subsys/syslogd |
| 206 |
;; |
206 |
;; |
| 207 |
try-restart|condrestart) |
207 |
try-restart|condrestart) |
| 208 |
if test "$1" = "condrestart"; then |
208 |
if test "$1" = "condrestart"; then |