This commit is contained in:
parent
7f021bb6da
commit
0fa6e5fc83
39
rc.syslog
39
rc.syslog
@ -4,7 +4,7 @@
|
|||||||
# Copyright (c) 2002-2003 SuSE Linux AG, Nuernberg, Germany.
|
# Copyright (c) 2002-2003 SuSE Linux AG, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# Author: Florian La Roche <florian@suse.de>, 1996
|
# Author: Florian La Roche <florian@suse.de>, 1996
|
||||||
# Werner Fink <werner@suse.de>, 1998-2001
|
# Werner Fink <werner@suse.de>, 1998-2001,2008
|
||||||
#
|
#
|
||||||
# /etc/init.d/syslog
|
# /etc/init.d/syslog
|
||||||
#
|
#
|
||||||
@ -57,16 +57,19 @@ syslog_use=""
|
|||||||
|
|
||||||
# check config and programs
|
# check config and programs
|
||||||
test -s ${config} || {
|
test -s ${config} || {
|
||||||
echo 1>&2 "${config} does not exist"
|
echo "${config} does not exist" 1>&2
|
||||||
if test "$1" == "stop" ; then exit 0 ; else exit 6 ; fi
|
test "$1" == "stop" && exit 0
|
||||||
|
exit 6
|
||||||
}
|
}
|
||||||
test -x ${syslog_bin} || {
|
test -x ${syslog_bin} || {
|
||||||
echo 1>&2 "${syslog_bin} is not installed"
|
echo "${syslog_bin} is not installed" 1>&2
|
||||||
if test "$1" == "stop" ; then exit 0 ; else exit 5 ; fi
|
test "$1" == "stop" && exit 0
|
||||||
|
exit 5
|
||||||
}
|
}
|
||||||
test -x ${klog_bin} || {
|
test -x ${klog_bin} || {
|
||||||
echo 1>&2 "${klog_bin} is not installed"
|
echo "${klog_bin} is not installed" 1>&2
|
||||||
if test "$1" == "stop" ; then exit 0 ; else exit 5 ; fi
|
test "$1" == "stop" && exit 0
|
||||||
|
exit 5
|
||||||
}
|
}
|
||||||
test -s /var/lock/subsys/syslogd && {
|
test -s /var/lock/subsys/syslogd && {
|
||||||
read -t 5 syslog_use < /var/lock/subsys/syslogd
|
read -t 5 syslog_use < /var/lock/subsys/syslogd
|
||||||
@ -77,35 +80,33 @@ syslog_use_pid="/var/run/${syslog_use##*\/}.pid"
|
|||||||
#
|
#
|
||||||
# Do not translate symbol addresses for 2.6 kernel
|
# Do not translate symbol addresses for 2.6 kernel
|
||||||
#
|
#
|
||||||
case `uname -r` in
|
case "$(uname -r)" in
|
||||||
0.*|1.*|2.[0-4].*)
|
[01].*|2.[0-4].*) ;;
|
||||||
;;
|
*) case "$KLOGD_PARAMS" in
|
||||||
*)
|
*-x*) ;;
|
||||||
KLOGD_PARAMS="${KLOGD_PARAMS:+$KLOGD_PARAMS }-x"
|
*) KLOGD_PARAMS="${KLOGD_PARAMS:+$KLOGD_PARAMS }-x"
|
||||||
;;
|
esac
|
||||||
esac
|
esac
|
||||||
|
|
||||||
. /etc/rc.status
|
. /etc/rc.status
|
||||||
rc_reset
|
rc_reset
|
||||||
case "$1" in
|
case "$1" in
|
||||||
start)
|
start)
|
||||||
if test -f /var/lock/subsys/earlysyslog ; then
|
if test -e /var/lock/subsys/earlysyslog ; then
|
||||||
# Syslog service already done
|
# Syslog service already done
|
||||||
rm -f /var/lock/subsys/earlysyslog
|
rm -f /var/lock/subsys/earlysyslog
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
if test "$2" = "early" ; then
|
if test "$2" = "early" ; then
|
||||||
# Start syslog service early
|
# Start syslog service early
|
||||||
touch /var/lock/subsys/earlysyslog
|
> /var/lock/subsys/earlysyslog
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! test -e /dev/xconsole ; then
|
if ! test -e /dev/xconsole ; then
|
||||||
mkfifo -m 0600 /dev/xconsole
|
mknod -m 0600 /dev/xconsole p
|
||||||
chown root:tty /dev/xconsole
|
chown root:tty /dev/xconsole
|
||||||
fi
|
fi
|
||||||
if test -s /var/run/klogd.pid ; then
|
killproc -p /var/run/klogd.pid ${klog_bin}
|
||||||
killproc ${klog_bin}
|
|
||||||
fi
|
|
||||||
if test -s ${syslog_use_pid} ; then
|
if test -s ${syslog_use_pid} ; then
|
||||||
killproc -p ${syslog_use_pid} ${syslog_use}
|
killproc -p ${syslog_use_pid} ${syslog_use}
|
||||||
echo -n "Re-"
|
echo -n "Re-"
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu May 8 16:59:36 CEST 2008 - werner@suse.de
|
||||||
|
|
||||||
|
- Clean syslog boot script and replace mkfifo with mknod (bnc#382236)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Apr 3 11:08:30 CEST 2008 - mkoenig@suse.de
|
Thu Apr 3 11:08:30 CEST 2008 - mkoenig@suse.de
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ PreReq: coreutils %fillup_prereq klogd sed
|
|||||||
Provides: syslog
|
Provides: syslog
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 1.4.1
|
Version: 1.4.1
|
||||||
Release: 664
|
Release: 671
|
||||||
Summary: The Syslog daemon
|
Summary: The Syslog daemon
|
||||||
Source: sysklogd-1.4.1.tar.bz2
|
Source: sysklogd-1.4.1.tar.bz2
|
||||||
Source1: logrotate.syslog
|
Source1: logrotate.syslog
|
||||||
@ -224,6 +224,8 @@ fi
|
|||||||
%{omc_svcdir}/syslog.xml
|
%{omc_svcdir}/syslog.xml
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 08 2008 werner@suse.de
|
||||||
|
- Clean syslog boot script and replace mkfifo with mknod (bnc#382236)
|
||||||
* Thu Apr 03 2008 mkoenig@suse.de
|
* Thu Apr 03 2008 mkoenig@suse.de
|
||||||
- readd removed defines for svcinfo path
|
- readd removed defines for svcinfo path
|
||||||
* Tue Apr 01 2008 mkoenig@suse.de
|
* Tue Apr 01 2008 mkoenig@suse.de
|
||||||
|
Loading…
Reference in New Issue
Block a user