Updating link to change in openSUSE:Factory/syslogd revision 27.0
OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=2506042c57db52e9afa346e13d7a2b29
This commit is contained in:
OBS User buildservice-autocommit
Git OBS Bridge
parent
d158115046
commit
3898207573
76
rc.syslog
76
rc.syslog
@ -6,8 +6,8 @@
|
|||||||
#
|
#
|
||||||
# Author: Florian La Roche <florian@suse.de>, 1996
|
# Author: Florian La Roche <florian@suse.de>, 1996
|
||||||
# Werner Fink <werner@suse.de>, 1998-2008
|
# Werner Fink <werner@suse.de>, 1998-2008
|
||||||
# Stephan Kulow <coolo@suse.de>, 2005-2008
|
# Stephan Kulow <coolo@suse.de>, 2005-2008
|
||||||
# Marius Tomaschewski <mt@suse.de>, 2001-2008
|
# Marius Tomaschewski <mt@suse.de>, 2001-2008
|
||||||
#
|
#
|
||||||
# /etc/init.d/syslog
|
# /etc/init.d/syslog
|
||||||
#
|
#
|
||||||
@ -29,9 +29,9 @@ BINDIR=/sbin
|
|||||||
# update $SYSLOG_DAEMON if not up-to-date
|
# update $SYSLOG_DAEMON if not up-to-date
|
||||||
test -n "$SYSLOG_DAEMON" && \
|
test -n "$SYSLOG_DAEMON" && \
|
||||||
test -x "${BINDIR}/$SYSLOG_DAEMON" || {
|
test -x "${BINDIR}/$SYSLOG_DAEMON" || {
|
||||||
for SYSLOG_DAEMON in rsyslogd syslog-ng syslogd ; do
|
for SYSLOG_DAEMON in rsyslogd syslog-ng syslogd ; do
|
||||||
test -x "${BINDIR}/$SYSLOG_DAEMON" && break
|
test -x "${BINDIR}/$SYSLOG_DAEMON" && break
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
# set daemon dependent variables
|
# set daemon dependent variables
|
||||||
@ -52,8 +52,8 @@ case "$SYSLOG_DAEMON" in
|
|||||||
while read one two rest ; do
|
while read one two rest ; do
|
||||||
test "x$one" = 'x$ModLoad' && \
|
test "x$one" = 'x$ModLoad' && \
|
||||||
test "x$two" = 'ximklog.so' && {
|
test "x$two" = 'ximklog.so' && {
|
||||||
start_klogd=no
|
start_klogd=no
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
done < $config
|
done < $config
|
||||||
;;
|
;;
|
||||||
@ -61,6 +61,7 @@ case "$SYSLOG_DAEMON" in
|
|||||||
syslog=syslog-ng
|
syslog=syslog-ng
|
||||||
config=/etc/syslog-ng/syslog-ng.conf
|
config=/etc/syslog-ng/syslog-ng.conf
|
||||||
params="$SYSLOG_NG_PARAMS"
|
params="$SYSLOG_NG_PARAMS"
|
||||||
|
ngsocks="/var/run/syslog-ng/additional-log-sockets.conf"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
syslog=syslogd
|
syslog=syslogd
|
||||||
@ -115,7 +116,7 @@ case "$1" in
|
|||||||
# Syslog service already done
|
# Syslog service already done
|
||||||
rm -f /var/lock/subsys/earlysyslog
|
rm -f /var/lock/subsys/earlysyslog
|
||||||
case "$SYSLOG_DAEMON" in
|
case "$SYSLOG_DAEMON" in
|
||||||
rsyslogd) ;; # switch to normal config
|
rsyslogd) ;; # switch to normal config
|
||||||
*) exit 0 ;;
|
*) exit 0 ;;
|
||||||
esac
|
esac
|
||||||
elif test "$2" = "early" ; then
|
elif test "$2" = "early" ; then
|
||||||
@ -136,30 +137,41 @@ case "$1" in
|
|||||||
echo -n "Starting syslog services"
|
echo -n "Starting syslog services"
|
||||||
test -z "$KERNEL_LOGLEVEL" && KERNEL_LOGLEVEL=1
|
test -z "$KERNEL_LOGLEVEL" && KERNEL_LOGLEVEL=1
|
||||||
|
|
||||||
case $syslog in
|
case $syslog in
|
||||||
(rsyslogd)
|
rsyslogd)
|
||||||
if [ "x$rsocks" != x ] ; then
|
if test -n "$rsocks" ; then
|
||||||
rm -f "$rsocks"
|
rm -f "$rsocks"
|
||||||
touch "$rsocks"
|
touch "$rsocks"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
syslog-ng)
|
||||||
|
echo 'source chroots{' > "$ngsocks"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
# add additional sockets to params or similar
|
# add additional sockets to params or similar
|
||||||
for variable in ${!SYSLOGD_ADDITIONAL_SOCKET*}; do
|
for variable in ${!SYSLOGD_ADDITIONAL_SOCKET*}; do
|
||||||
eval value=\$$variable
|
eval value=\$$variable
|
||||||
test -n "${value}" && test -d ${value%/*} && {
|
test -n "${value}" && test -d ${value%/*} && {
|
||||||
case $syslog in
|
case $syslog in
|
||||||
rsyslogd)
|
rsyslogd)
|
||||||
if [ "x$rsocks" != x ] ; then
|
if test -n "$rsocks" ; then
|
||||||
echo "\$AddUnixListenSocket $value" >> "$rsocks"
|
echo "\$AddUnixListenSocket $value" >> "$rsocks"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
*)
|
syslog-ng)
|
||||||
params="$params -a $value"
|
echo "unix-dgram(\"$value\");" >> "$ngsocks"
|
||||||
;;
|
;;
|
||||||
esac
|
*)
|
||||||
|
params="$params -a $value"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
}
|
}
|
||||||
done
|
done
|
||||||
|
case $syslog in
|
||||||
|
syslog-ng)
|
||||||
|
echo "};" >> "$ngsocks"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
startproc -p ${syslog_pid} ${syslog_bin} ${params}
|
startproc -p ${syslog_pid} ${syslog_bin} ${params}
|
||||||
rc_status
|
rc_status
|
||||||
|
|
||||||
@ -168,8 +180,8 @@ case "$1" in
|
|||||||
|
|
||||||
if test $? -eq 0 ; then
|
if test $? -eq 0 ; then
|
||||||
if test "$start_klogd" = yes ; then
|
if test "$start_klogd" = yes ; then
|
||||||
startproc ${klog_bin} -c $KERNEL_LOGLEVEL $KLOGD_PARAMS
|
startproc ${klog_bin} -c $KERNEL_LOGLEVEL $KLOGD_PARAMS
|
||||||
rc_status
|
rc_status
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
rc_status -v
|
rc_status -v
|
||||||
@ -180,9 +192,9 @@ case "$1" in
|
|||||||
|
|
||||||
echo -n "Shutting down syslog services"
|
echo -n "Shutting down syslog services"
|
||||||
if test "$start_klogd" = yes ; then
|
if test "$start_klogd" = yes ; then
|
||||||
killproc -TERM ${klog_bin} ; rc_status
|
killproc -TERM ${klog_bin} ; rc_status
|
||||||
else
|
else
|
||||||
killproc -TERM ${klog_bin}
|
killproc -TERM ${klog_bin}
|
||||||
fi
|
fi
|
||||||
killproc -p ${syslog_use_pid} -TERM ${syslog_use} ; rc_status -v
|
killproc -p ${syslog_use_pid} -TERM ${syslog_use} ; rc_status -v
|
||||||
rm -f /var/lock/subsys/syslogd
|
rm -f /var/lock/subsys/syslogd
|
||||||
@ -207,10 +219,10 @@ case "$1" in
|
|||||||
reload|force-reload)
|
reload|force-reload)
|
||||||
echo -n "Reload syslog service"
|
echo -n "Reload syslog service"
|
||||||
if test "$start_klogd" = yes ; then
|
if test "$start_klogd" = yes ; then
|
||||||
killproc -TSTP ${klog_bin} ; rc_status
|
killproc -TSTP ${klog_bin} ; rc_status
|
||||||
killproc -p ${syslog_use_pid} -HUP ${syslog_use} ; rc_status
|
killproc -p ${syslog_use_pid} -HUP ${syslog_use} ; rc_status
|
||||||
killproc -CONT ${klog_bin} ; rc_status
|
killproc -CONT ${klog_bin} ; rc_status
|
||||||
killproc -USR2 ${klog_bin} ; rc_status -v
|
killproc -USR2 ${klog_bin} ; rc_status -v
|
||||||
else
|
else
|
||||||
killproc -p ${syslog_use_pid} -HUP ${syslog_use} ; rc_status -v
|
killproc -p ${syslog_use_pid} -HUP ${syslog_use} ; rc_status -v
|
||||||
fi
|
fi
|
||||||
|
|||||||
@ -1,3 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Apr 12 12:28:46 CEST 2010 - werner@suse.de
|
||||||
|
|
||||||
|
- Reformat boot script
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Mar 31 20:47:31 CEST 2010 - pczanik@genesi-usa.com
|
||||||
|
|
||||||
|
- modify /etc/init.d/syslog for syslog-ng 3.X
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Mar 29 16:48:18 CEST 2010 - werner@suse.de
|
Mon Mar 29 16:48:18 CEST 2010 - werner@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -27,7 +27,7 @@ PreReq: coreutils %fillup_prereq klogd sed
|
|||||||
Provides: syslog
|
Provides: syslog
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 1.4.1
|
Version: 1.4.1
|
||||||
Release: 714
|
Release: 715
|
||||||
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
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user