This commit is contained in:
parent
bf60d858bb
commit
e9d2ad177e
26
rc.syslog
26
rc.syslog
@ -63,6 +63,7 @@ test -s /var/lock/subsys/syslogd && {
|
||||
read -t 5 syslog_use < /var/lock/subsys/syslogd
|
||||
}
|
||||
test -z "$syslog_use" && syslog_use=${syslog_bin}
|
||||
syslog_use_pid="/var/run/${syslog_use##*\/}.pid"
|
||||
|
||||
#
|
||||
# Do not translate symbol addresses for 2.6 kernel
|
||||
@ -96,9 +97,10 @@ case "$1" in
|
||||
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_use_pid} ; then
|
||||
killproc -p ${syslog_use_pid} ${syslog_use}
|
||||
echo -n "Re-"
|
||||
rm -f /var/lock/subsys/syslogd
|
||||
fi
|
||||
echo -n "Starting syslog services"
|
||||
test -z "$KERNEL_LOGLEVEL" && KERNEL_LOGLEVEL=1
|
||||
@ -120,8 +122,8 @@ case "$1" in
|
||||
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
|
||||
killproc -TERM ${klog_bin} ; rc_status
|
||||
killproc -p ${syslog_use_pid} -TERM ${syslog_use} ; rc_status -v
|
||||
rm -f /var/lock/subsys/syslogd
|
||||
;;
|
||||
try-restart|condrestart)
|
||||
@ -143,18 +145,22 @@ case "$1" in
|
||||
;;
|
||||
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_use_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_use_pid} ${syslog_use} ; rc_status -v
|
||||
;;
|
||||
probe)
|
||||
test ${config} -nt ${syslog_pid} && echo reload
|
||||
if test "${syslog_use_pid}" != "${syslog_pid}" ; then
|
||||
echo restart
|
||||
else
|
||||
test ${config} -nt ${syslog_pid} && echo reload
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
|
||||
|
@ -75,6 +75,11 @@ file extension.
|
||||
<modulePath>/sbin/syslog-ng</modulePath>
|
||||
</processInformation>
|
||||
|
||||
<processInformation>
|
||||
<name>syslogd</name>
|
||||
<modulePath>/sbin/syslogd</modulePath>
|
||||
</processInformation>
|
||||
|
||||
<!--
|
||||
Define the services that this service has a dependency on.
|
||||
There must be a corresponding Service Description XML file
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 4 18:03:47 CET 2007 - mt@suse.de
|
||||
|
||||
- Added syslogd path to processInformation tag in syslog.xml and
|
||||
moved it to klogd file list; used by syslog-ng too (FATE #301833)
|
||||
- Improved run-time switch from syslogd to syslog-ng (bug #166933)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 11 14:04:50 CET 2006 - mskibbe@suse.de
|
||||
|
||||
|
14
syslogd.spec
14
syslogd.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package syslogd (Version 1.4.1)
|
||||
#
|
||||
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
# package are under the same license as the package itself.
|
||||
#
|
||||
@ -17,7 +17,7 @@ PreReq: klogd
|
||||
Provides: syslog
|
||||
Autoreqprov: on
|
||||
Version: 1.4.1
|
||||
Release: 585
|
||||
Release: 589
|
||||
Summary: The Syslog daemon
|
||||
Source: sysklogd-1.4.1.tar.bz2
|
||||
Source1: logrotate.syslog
|
||||
@ -194,9 +194,6 @@ chown news:news var/log/news/news.notice
|
||||
%doc %{_mandir}/man5/syslog.conf.5.gz
|
||||
%doc %{_mandir}/man8/syslogd.8.gz
|
||||
/sbin/syslogd
|
||||
%dir /etc/omc/
|
||||
%dir /etc/omc/srvinfo.d/
|
||||
/etc/omc/srvinfo.d/syslog.xml
|
||||
|
||||
%files -n klogd
|
||||
%defattr(-,root,root)
|
||||
@ -208,8 +205,15 @@ chown news:news var/log/news/news.notice
|
||||
%doc %{_mandir}/man8/sysklogd.8.gz
|
||||
/sbin/rcsyslog
|
||||
/sbin/klogd
|
||||
%dir /etc/omc/
|
||||
%dir /etc/omc/srvinfo.d/
|
||||
/etc/omc/srvinfo.d/syslog.xml
|
||||
|
||||
%changelog -n syslogd
|
||||
* Thu Jan 04 2007 - mt@suse.de
|
||||
- Added syslogd path to processInformation tag in syslog.xml and
|
||||
moved it to klogd file list; used by syslog-ng too (FATE #301833)
|
||||
- Improved run-time switch from syslogd to syslog-ng (bug #166933)
|
||||
* Mon Dec 11 2006 - mskibbe@suse.de
|
||||
- add service xml file
|
||||
* Wed Nov 15 2006 - werner@suse.de
|
||||
|
Loading…
Reference in New Issue
Block a user