From 4e7519dd45ff929a4fa422f6c89cf7f5c45e190d6dbe7edf4ded2d2e1dcf206b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Wed, 1 Jun 2011 16:26:03 +0000
Subject: [PATCH] Accepting request 72246 from
 home:lnussel:branches:Base:System

- 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
---
 rc.syslog       | 18 +++++++++---------
 syslogd.changes |  5 +++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/rc.syslog b/rc.syslog
index 7e1ee89..d2c509f 100644
--- a/rc.syslog
+++ b/rc.syslog
@@ -96,8 +96,8 @@ test -x ${klog_bin}   || {
     test "$1" == "stop" && exit 0
     exit 5
 }
-test -s /var/lock/subsys/syslogd && {
-    read -t 5 syslog_use < /var/lock/subsys/syslogd
+test -s /run/rcsyslog && {
+    read -t 5 syslog_use < /run/rcsyslog
 }
 test -z "$syslog_use" && syslog_use=${syslog_bin}
 syslog_use_pid="/var/run/${syslog_use##*\/}.pid"
@@ -117,16 +117,16 @@ esac
 rc_reset
 case "$1" in
     start)
-	if test -e /var/lock/subsys/earlysyslog ; then
+	if test -e /run/rcearlysyslog ; then
 	    # Syslog service already done
-	    rm -f  /var/lock/subsys/earlysyslog
+	    rm -f  /run/rcearlysyslog
 	    case "$SYSLOG_DAEMON" in
 		rsyslogd) ;; # switch to normal config
 		*) exit 0 ;;
 	    esac
 	elif test "$2" = "early" ; then
 	    # Start syslog service early
-	    > /var/lock/subsys/earlysyslog
+	    > /run/rcearlysyslog
  	fi
 
 	if ! test -e /dev/xconsole ; then
@@ -137,7 +137,7 @@ case "$1" in
 	if test -s ${syslog_use_pid} ; then
 	    killproc -p ${syslog_use_pid} ${syslog_use}
 	    echo -n "Re-"
-	    rm -f /var/lock/subsys/syslogd
+	    rm -f /run/rcsyslog
 	fi
 	echo -n "Starting syslog services"
 	test -z "$KERNEL_LOGLEVEL" && KERNEL_LOGLEVEL=1
@@ -181,7 +181,7 @@ case "$1" in
 	rc_status
 
 	# 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 "$start_klogd" = yes ; then
@@ -192,7 +192,7 @@ case "$1" in
 	rc_status -v
 	;;
     stop)
-	rm -f /var/lock/subsys/earlysyslog
+	rm -f /run/rcearlysyslog
 	test "$2" = "early" && exit 0
 
 	echo -n "Shutting down syslog services"
@@ -202,7 +202,7 @@ case "$1" in
 	    killproc ${klog_bin}
 	fi
 	killproc -p ${syslog_use_pid} ${syslog_use} ; rc_status -v
-	rm -f /var/lock/subsys/syslogd
+	rm -f /run/rcsyslog
 	;;
     try-restart|condrestart)
 	if test "$1" = "condrestart"; then
diff --git a/syslogd.changes b/syslogd.changes
index c22b7ec..0438cfd 100644
--- a/syslogd.changes
+++ b/syslogd.changes
@@ -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