Hello community, here is the log from the commit of package syslogd checked in at Tue Jul 11 20:31:06 CEST 2006. -------- --- syslogd/syslogd.changes 2006-05-22 20:52:42.000000000 +0200 +++ syslogd/syslogd.changes 2006-07-11 16:38:43.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 11 16:37:58 CEST 2006 - werner@suse.de + +- Enable run-time switch from syslogd to syslog-ng (bug #166933) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslogd.spec ++++++ --- /var/tmp/diff_new_pack.alIalK/_old 2006-07-11 20:30:22.000000000 +0200 +++ /var/tmp/diff_new_pack.alIalK/_new 2006-07-11 20:30:22.000000000 +0200 @@ -17,7 +17,7 @@ Provides: syslog Autoreqprov: on Version: 1.4.1 -Release: 559 +Release: 560 Summary: The Syslog daemon Source: sysklogd-1.4.1.tar.bz2 Source1: logrotate.syslog @@ -200,6 +200,8 @@ /sbin/klogd %changelog -n syslogd +* Tue Jul 11 2006 - werner@suse.de +- Enable run-time switch from syslogd to syslog-ng (bug #166933) * Mon May 22 2006 - schwab@suse.de - Don't strip binaries. * Wed Feb 15 2006 - mt@suse.de ++++++ rc.earlysyslog ++++++ --- syslogd/rc.earlysyslog 2005-04-19 09:05:27.000000000 +0200 +++ syslogd/rc.earlysyslog 2006-07-11 16:45:05.000000000 +0200 @@ -31,18 +31,20 @@ config=/etc/syslog.conf ;; esac +syslog_bin=${BINDIR}/$syslog + klog_bin=${BINDIR}/klogd # check config and programs test -s ${config} || { echo 1>&2 "${config} does not exist" if test "$1" == "stop" ; then exit 0 ; else exit 6 ; fi } -test -x ${BINDIR}/$syslog || { - echo 1>&2 "${BINDIR}/$syslog is not installed" +test -x ${syslog_bin} || { + echo 1>&2 "${syslog_bin} is not installed" if test "$1" == "stop" ; then exit 0 ; else exit 5 ; fi } -test -x ${BINDIR}/klogd || { - echo 1>&2 "${BINDIR}/klogd is not installed" +test -x ${klog_bin} || { + echo 1>&2 "${klog_bin} is not installed" if test "$1" == "stop" ; then exit 0 ; else exit 5 ; fi } ++++++ rc.syslog ++++++ --- syslogd/rc.syslog 2005-04-19 09:05:33.000000000 +0200 +++ syslogd/rc.syslog 2006-07-11 16:40:47.000000000 +0200 @@ -41,21 +41,27 @@ ;; esac syslog_pid="/var/run/${syslog}.pid" +syslog_bin=${BINDIR}/$syslog + klog_bin=${BINDIR}/klogd +syslog_use="" # check config and programs test -s ${config} || { echo 1>&2 "${config} does not exist" if test "$1" == "stop" ; then exit 0 ; else exit 6 ; fi } -test -x ${BINDIR}/$syslog || { - echo 1>&2 "${BINDIR}/$syslog is not installed" +test -x ${syslog_bin} || { + echo 1>&2 "${syslog_bin} is not installed" if test "$1" == "stop" ; then exit 0 ; else exit 5 ; fi } -test -x ${BINDIR}/klogd || { - echo 1>&2 "${BINDIR}/klogd is not installed" +test -x ${klog_bin} || { + 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 -z "$syslog_use" && syslog_use=${syslog_bin} # # Do not translate symbol addresses for 2.6 kernel @@ -86,18 +92,24 @@ mkfifo -m 0600 /dev/xconsole chown root:tty /dev/xconsole fi - test -s /var/run/klogd.pid && killproc ${BINDIR}/klogd - test -s ${syslog_pid} && { - killproc -p ${syslog_pid} ${BINDIR}/${syslog} + if test -s /var/run/klogd.pid ; then + killproc ${klog_bin} + fi + if test -s ${syslog_pid} ; then + killproc -p ${syslog_pid} ${syslog_use} echo -n "Re-" - } + fi echo -n "Starting syslog services" test -z "$KERNEL_LOGLEVEL" && KERNEL_LOGLEVEL=1 - startproc -p ${syslog_pid} ${BINDIR}/${syslog} $params + startproc -p ${syslog_pid} ${syslog_bin} ${params} rc_status + + # Remember the currently used syslog daemon + echo ${syslog_bin} > /var/lock/subsys/syslogd + if test $? -eq 0 ; then - startproc ${BINDIR}/klogd -c $KERNEL_LOGLEVEL $KLOGD_PARAMS + startproc ${klog_bin} -c $KERNEL_LOGLEVEL $KLOGD_PARAMS rc_status fi rc_status -v @@ -105,9 +117,11 @@ stop) rm -f /var/lock/subsys/earlysyslog test "$2" = "early" && exit 0 + echo -n "Shutting down syslog services" - killproc -TERM ${BINDIR}/klogd ; rc_status - killproc -p ${syslog_pid} -TERM ${BINDIR}/${syslog} ; rc_status -v + killproc -TERM ${klog_bin} ; rc_status + killproc -p ${syslog_pid} -TERM ${syslog_use} ; rc_status -v + rm -f /var/lock/subsys/syslogd ;; try-restart|condrestart) if test "$1" = "condrestart"; then @@ -128,15 +142,15 @@ ;; reload|force-reload) echo -n "Reload syslog service" - killproc -TSTP ${BINDIR}/klogd ; rc_status - killproc -p ${syslog_pid} -HUP ${BINDIR}/${syslog} ; rc_status - killproc -CONT ${BINDIR}/klogd ; rc_status - killproc -USR2 ${BINDIR}/klogd ; rc_status -v + 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 ;; status) echo -n "Checking for service syslog:" - checkproc ${BINDIR}/klogd ; rc_status - checkproc -p ${syslog_pid} ${BINDIR}/${syslog} ; rc_status -v + checkproc ${klog_bin} ; rc_status + checkproc -p ${syslog_pid} ${syslog_use} ; rc_status -v ;; probe) test ${config} -nt ${syslog_pid} && echo reload ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org