pool/syslogd
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 72246 from home:lnussel:branches:Base:System

Browse Source 
- don't use /var/lock/subsys

OBS-URL: https://build.opensuse.org/request/show/72246
OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=38
This commit is contained in:
Cristian Rodríguez 2011-06-01 16:26:03 +00:00 committed by Git OBS Bridge
parent 3429af3833
commit 4e7519dd45
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rc.syslog
View File

@ -96,8 +96,8 @@ test -x ${klog_bin} || {
test "$1" == "stop" && exit 0 test "$1" == "stop" && exit 0
exit 5 exit 5
} }
test -s /var/lock/subsys/syslogd && { test -s /run/rcsyslog && {
read -t 5 syslog_use < /var/lock/subsys/syslogd read -t 5 syslog_use < /run/rcsyslog
} }
test -z "$syslog_use" && syslog_use=${syslog_bin} test -z "$syslog_use" && syslog_use=${syslog_bin}
syslog_use_pid="/var/run/${syslog_use##*\/}.pid" syslog_use_pid="/var/run/${syslog_use##*\/}.pid"
@ -117,16 +117,16 @@ esac
rc_reset rc_reset
case "$1" in case "$1" in
start) start)
if test -e /var/lock/subsys/earlysyslog ; then if test -e /run/rcearlysyslog ; then
# Syslog service already done # Syslog service already done
rm -f /var/lock/subsys/earlysyslog rm -f /run/rcearlysyslog
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
# Start syslog service early # Start syslog service early
> /var/lock/subsys/earlysyslog > /run/rcearlysyslog
fi fi
if ! test -e /dev/xconsole ; then if ! test -e /dev/xconsole ; then
@ -137,7 +137,7 @@ case "$1" in
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-"
rm -f /var/lock/subsys/syslogd rm -f /run/rcsyslog
fi fi
echo -n "Starting syslog services" echo -n "Starting syslog services"
test -z "$KERNEL_LOGLEVEL" && KERNEL_LOGLEVEL=1 test -z "$KERNEL_LOGLEVEL" && KERNEL_LOGLEVEL=1
@ -181,7 +181,7 @@ case "$1" in
rc_status rc_status
# Remember the currently used syslog daemon # Remember the currently used syslog daemon
echo ${syslog_bin} > /var/lock/subsys/syslogd echo ${syslog_bin} > /run/rcsyslog
if test $? -eq 0 ; then if test $? -eq 0 ; then
if test "$start_klogd" = yes ; then if test "$start_klogd" = yes ; then
@ -192,7 +192,7 @@ case "$1" in
rc_status -v rc_status -v
;; ;;
stop) stop)
rm -f /var/lock/subsys/earlysyslog rm -f /run/rcearlysyslog
test "$2" = "early" && exit 0 test "$2" = "early" && exit 0
echo -n "Shutting down syslog services" echo -n "Shutting down syslog services"
@ -202,7 +202,7 @@ case "$1" in
killproc ${klog_bin} killproc ${klog_bin}
fi fi
killproc -p ${syslog_use_pid} ${syslog_use} ; rc_status -v killproc -p ${syslog_use_pid} ${syslog_use} ; rc_status -v
rm -f /var/lock/subsys/syslogd rm -f /run/rcsyslog
;; ;;
try-restart|condrestart) try-restart|condrestart)
if test "$1" = "condrestart"; then if test "$1" = "condrestart"; then

5
syslogd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 27 11:47:47 UTC 2011 - lnussel@suse.de
- don't use /var/lock/subsys
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 27 07:53:38 UTC 2011 - mt@suse.de Fri May 27 07:53:38 UTC 2011 - mt@suse.de