packages: heimdal/heimdal-ipropd.init, heimdal/heimdal-kcm.init, heimdal/he...

[baggins]

Author: baggins                      Date: Thu Jul  9 11:28:06 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 10
- simplify init scripts, it's rc-scripts job to assure that deamon started

---- Files affected:
packages/heimdal:
   heimdal-ipropd.init (1.1 -> 1.2) , heimdal-kcm.init (1.3 -> 1.4) , heimdal-kpasswdd.init (1.6 -> 1.7) , heimdal.init (1.18 -> 1.19) , heimdal.spec (1.171 -> 1.172) 

---- Diffs:

================================================================
Index: packages/heimdal/heimdal-ipropd.init
diff -u packages/heimdal/heimdal-ipropd.init:1.1 packages/heimdal/heimdal-ipropd.init:1.2
--- packages/heimdal/heimdal-ipropd.init:1.1	Wed Jul  8 12:43:54 2009
+++ packages/heimdal/heimdal-ipropd.init	Thu Jul  9 13:28:01 2009
@@ -35,14 +35,8 @@
 			msg_starting "Kerberos Replication Daemon (Master)"
 			busy
 			daemon ipropd-master --detach
-			sleep 1
-			pid=$(pidofproc "ipropd-master" "/var/run/ipropd-master.pid")
-			if [ -n "$pid" ]; then
-				touch /var/lock/subsys/ipropd-master
-				ok
-			else
-				fail
-			fi
+			RETVAL=$?
+			[ $RETVAL -eq 0 ] && touch /var/lock/subsys/ipropd-master
 		else
 			msg_already_running "Kerberos Replication Daemon (Master)"
 		fi
@@ -52,14 +46,8 @@
 			msg_starting "Kerberos Replication Daemon (Slave)"
 			busy
 			daemon ipropd-slave --detach $SLAVE_PARAMS
-			sleep 1
-			pid=$(pidofproc "ipropd-slave" "/var/run/ipropd-slave.pid")
-			if [ -n "$pid" ]; then
-				touch /var/lock/subsys/ipropd-slave
-				ok
-			else
-				fail
-			fi
+			RETVAL=$?
+			[ $RETVAL -eq 0 ] && touch /var/lock/subsys/ipropd-slave
 		else
 			msg_already_running "Kerberos Replication Daemon (Slave)"
 		fi

================================================================
Index: packages/heimdal/heimdal-kcm.init
diff -u packages/heimdal/heimdal-kcm.init:1.3 packages/heimdal/heimdal-kcm.init:1.4
--- packages/heimdal/heimdal-kcm.init:1.3	Wed Jul  8 13:25:26 2009
+++ packages/heimdal/heimdal-kcm.init	Thu Jul  9 13:28:01 2009
@@ -33,14 +33,8 @@
 		msg_starting "Kerberos KCM"
 		busy
 		daemon kcm --detach
-		sleep 1
-		pid=$(pidofproc "kcm" "/var/run/kcm.pid")
-		if [ -n "$pid" ]; then
-			touch /var/lock/subsys/kcm
-			ok
-		else
-			fail
-		fi
+		RETVAL=$?
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/kcm
 	else
 		msg_already_running "Kerberos KCM"
 	fi

================================================================
Index: packages/heimdal/heimdal-kpasswdd.init
diff -u packages/heimdal/heimdal-kpasswdd.init:1.6 packages/heimdal/heimdal-kpasswdd.init:1.7
--- packages/heimdal/heimdal-kpasswdd.init:1.6	Wed Jul  8 12:43:54 2009
+++ packages/heimdal/heimdal-kpasswdd.init	Thu Jul  9 13:28:01 2009
@@ -34,14 +34,8 @@
 		msg_starting "Kerberos Password Changing Server"
 		busy
 		daemon --fork kpasswdd $KPASSWDD_PARAMS
-		sleep 1
-		pid=$(pidofproc "kpasswdd" "/var/run/kpasswdd.pid")
-		if [ -n "$pid" ]; then
-			touch /var/lock/subsys/kpasswdd
-			ok
-		else
-			fail
-		fi
+		RETVAL=$?
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/kpasswdd
 	else
 		msg_already_running "Kerberos Password Changing Server"
 	fi

================================================================
Index: packages/heimdal/heimdal.init
diff -u packages/heimdal/heimdal.init:1.18 packages/heimdal/heimdal.init:1.19
--- packages/heimdal/heimdal.init:1.18	Wed Jul  8 12:43:54 2009
+++ packages/heimdal/heimdal.init	Thu Jul  9 13:28:01 2009
@@ -37,14 +37,8 @@
 		msg_starting "Kerberos KDC"
 		busy
 		daemon kdc --detach $KDC_PARAMS
-		sleep 1
-		pid=$(pidofproc "kdc" "/var/run/kdc.pid")
-		if [ -n "$pid" ]; then
-			touch /var/lock/subsys/heimdal
-			ok
-		else
-			fail
-		fi
+		RETVAL=$?
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/heimdal
 	else
 		msg_already_running "Kerberos KDC"
 	fi

================================================================
Index: packages/heimdal/heimdal.spec
diff -u packages/heimdal/heimdal.spec:1.171 packages/heimdal/heimdal.spec:1.172
--- packages/heimdal/heimdal.spec:1.171	Thu Jul  9 12:20:04 2009
+++ packages/heimdal/heimdal.spec	Thu Jul  9 13:28:01 2009
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	Implementacja Heimdal systemu Kerberos V5
 Name:		heimdal
 Version:	1.2.1
-Release:	9
+Release:	10
 License:	Free
 Group:		Networking
 Source0:	http://www.h5l.org/dist/src/%{name}-%{version}.tar.gz
@@ -755,6 +755,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.172  2009/07/09 11:28:01  baggins
+- rel 10
+- simplify init scripts, it's rc-scripts job to assure that deamon started
+
 Revision 1.171  2009/07/09 10:20:04  baggins
 - rel 9
 - link kcm statically against heimdal libs and install it in /sbin
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal-ipropd.init?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal-kcm.init?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal-kpasswdd.init?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal.init?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal.spec?r1=1.171&r2=1.172&f=u