rpms/sysklogd/devel sysklogd-1.4.2rh-initExit.patch, NONE, 1.1 sysklogd.spec, 1.58, 1.59

[Peter Vrabec (pvrabec)]

Author: pvrabec

Update of /cvs/extras/rpms/sysklogd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21165

Modified Files:
	sysklogd.spec 
Added Files:
	sysklogd-1.4.2rh-initExit.patch 
Log Message:
fix syslog init script error codes


sysklogd-1.4.2rh-initExit.patch:

--- NEW FILE sysklogd-1.4.2rh-initExit.patch ---
--- sysklogd-1.4.2rh/redhat/syslog.init.initExit	2007-06-25 14:10:05.000000000 +0200
+++ sysklogd-1.4.2rh/redhat/syslog.init	2007-06-25 14:16:27.000000000 +0200
@@ -18,25 +18,25 @@
 # Source function library.
 . /etc/init.d/functions
 
-[ -f /sbin/syslogd ] || exit 0
-[ -f /sbin/klogd ] || exit 0
-
-# Source config
-if [ -f /etc/sysconfig/syslog ] ; then
-	. /etc/sysconfig/syslog
-else
-	SYSLOGD_OPTIONS="-m 0"
-	KLOGD_OPTIONS="-2"
-fi
-
 RETVAL=0
 
-if [ -z "$SYSLOG_UMASK" ] ; then
-      SYSLOG_UMASK=077;
-fi
-umask $SYSLOG_UMASK
-
 start() {
+	[ -x /sbin/syslogd ] || exit 5
+	[ -x /sbin/klogd ] || exit 5
+
+	# Source config
+	if [ -f /etc/sysconfig/syslog ] ; then
+		. /etc/sysconfig/syslog
+	else
+		SYSLOGD_OPTIONS="-m 0"
+		KLOGD_OPTIONS="-2"
+	fi
+
+	if [ -z "$SYSLOG_UMASK" ] ; then
+	      SYSLOG_UMASK=077;
+	fi
+	umask $SYSLOG_UMASK
+
  	echo -n $"Starting system logger: "
 	daemon syslogd $SYSLOGD_OPTIONS
 	RETVAL=$?
@@ -116,7 +116,7 @@
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
-	exit 1
+	exit 2
 esac
 
 exit $?


Index: sysklogd.spec
===================================================================
RCS file: /cvs/extras/rpms/sysklogd/devel/sysklogd.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sysklogd.spec	11 Jun 2007 10:20:18 -0000	1.58
+++ sysklogd.spec	25 Jun 2007 12:19:14 -0000	1.59
@@ -1,7 +1,7 @@
 Summary: System logging and kernel message trapping daemons
 Name: sysklogd
 Version: 1.4.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.infodrom.org/projects/sysklogd/
@@ -18,6 +18,7 @@
 Patch3: sysklogd-1.4.2rh-dispatcher.patch
 Patch4: sysklogd-1.4.2rh-startFailed.patch
 Patch5: sysklogd-1.4.2rh-reload.patch
+Patch6: sysklogd-1.4.2rh-initExit.patch
 Conflicts: logrotate < 3.5.2
 Requires: logrotate
 Requires: bash >= 2.0
@@ -51,6 +52,7 @@
 %patch3 -p1 -b .dispatcher
 %patch4 -p1 -b .startFailed
 %patch5 -p1 -b .reload
+%patch6 -p1 -b .initExit
 
 %build
 make %{?_smp_mflags}
@@ -123,6 +125,9 @@
 %{_includedir}/sysklogd/sysklogd-dispatch.h
 
 %changelog
+* Mon Jun 25 2007 Peter Vrabec <pvrabec at redhat.com> 1.4.2-10
+- fix syslog init script error codes (#245330)
+
 * Mon Jun 11 2007 Peter Vrabec <pvrabec at redhat.com> 1.4.2-9
 - fix reload option in initscript (#243507)