[packages/heimdal] simplify initscripts

[glen]

commit fae2ef8cd5bd3441c43f87e0a8e1269672b70713
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Feb 25 10:05:46 2014 +0200

    simplify initscripts

 heimdal-ipropd.init   | 100 ++++++++++++++++++++++++++++++--------------------
 heimdal-kcm.init      |  37 ++++++++++---------
 heimdal-kpasswdd.init |  37 ++++++++++---------
 heimdal.init          |  37 ++++++++++---------
 4 files changed, 118 insertions(+), 93 deletions(-)
---
diff --git a/heimdal-ipropd.init b/heimdal-ipropd.init
index 844b7ca..a4bad0d 100755
--- a/heimdal-ipropd.init
+++ b/heimdal-ipropd.init
@@ -6,7 +6,6 @@
 # processname:	ipropd-master ipropd-slave
 # config:	/etc/krb5.conf
 
-
 # Source function library
 . /etc/rc.d/init.d/functions
 
@@ -27,62 +26,85 @@ else
 	exit 0
 fi
 
-start() {
-	local pid
-
-	if is_yes "$MASTER_ENABLED"; then
-		if [ ! -f /var/lock/subsys/ipropd-master ]; then
-			msg_starting "Kerberos Replication Daemon (Master)"
-			busy
-			daemon ipropd-master --detach
-			RETVAL=$?
-			[ $RETVAL -eq 0 ] && touch /var/lock/subsys/ipropd-master
-		else
-			msg_already_running "Kerberos Replication Daemon (Master)"
-		fi
+start_master() {
+	if [ -f /var/lock/subsys/ipropd-master ]; then
+		msg_already_running "Kerberos Replication Daemon (Master)"
+		return
 	fi
-	if is_yes "$SLAVE_ENABLED"; then
-		if [ ! -f /var/lock/subsys/ipropd-slave ]; then
-			msg_starting "Kerberos Replication Daemon (Slave)"
-			busy
-			daemon ipropd-slave --detach $SLAVE_PARAMS
-			RETVAL=$?
-			[ $RETVAL -eq 0 ] && touch /var/lock/subsys/ipropd-slave
-		else
-			msg_already_running "Kerberos Replication Daemon (Slave)"
-		fi
+
+	if ! is_yes "$MASTER_ENABLED"; then
+		return
 	fi
+
+	msg_starting "Kerberos Replication Daemon (Master)"
+	busy
+	daemon ipropd-master --detach
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/ipropd-master
 }
 
-stop() {
-	if [ -f /var/lock/subsys/ipropd-master ]; then
-		msg_stopping "Kerberos Replication Daemon (Master)"
-		killproc ipropd-master
-		rm -f /var/lock/subsys/ipropd-master >/dev/null 2>&1
-	else
+start_slave() {
+	if [ -f /var/lock/subsys/ipropd-slave ]; then
+		msg_already_running "Kerberos Replication Daemon (Slave)"
+		return
+	fi
+
+	if ! is_yes "$SLAVE_ENABLED"; then
+		return
+	fi
+
+	msg_starting "Kerberos Replication Daemon (Slave)"
+	busy
+	daemon ipropd-slave --detach $SLAVE_PARAMS
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/ipropd-slave
+}
+
+stop_master() {
+	if [ ! -f /var/lock/subsys/ipropd-master ]; then
 		if is_yes "$MASTER_ENABLED"; then
 			msg_not_running "Kerberos Replication Daemon (Master)"
 		fi
+		return
 	fi
-	if [ -f /var/lock/subsys/ipropd-slave ]; then
-		msg_stopping "Kerberos Replication Daemon (Slave)"
-		killproc ipropd-slave
-		rm -f /var/lock/subsys/ipropd-slave >/dev/null 2>&1
-	else
+
+	msg_stopping "Kerberos Replication Daemon (Master)"
+	killproc ipropd-master
+	rm -f /var/lock/subsys/ipropd-master >/dev/null 2>&1
+}
+
+stop_slave() {
+	if [ ! -f /var/lock/subsys/ipropd-slave ]; then
 		if is_yes "$SLAVE_ENABLED"; then
 			msg_not_running "Kerberos Replication Daemon (Slave)"
 		fi
+		return
 	fi
+
+	msg_stopping "Kerberos Replication Daemon (Slave)"
+	killproc ipropd-slave
+	rm -f /var/lock/subsys/ipropd-slave >/dev/null 2>&1
+}
+
+start() {
+	start_master
+	start_slave
+}
+
+stop() {
+	stop_master
+	stop_slave
 }
 
 condrestart() {
-	if [ -f /var/lock/subsys/ipropd-master -o -f /var/lock/subsys/ipropd-slave ]; then
-		stop
-		start
-	else
+	if [ ! -f /var/lock/subsys/ipropd-master -a ! -f /var/lock/subsys/ipropd-slave ]; then
 		msg_not_running "Kerberos Replication Daemons"
 		RETVAL=$1
+		return
 	fi
+
+	stop
+	start
 }
 
 RETVAL=0
diff --git a/heimdal-kcm.init b/heimdal-kcm.init
index 6b13156..ebc7588 100755
--- a/heimdal-kcm.init
+++ b/heimdal-kcm.init
@@ -27,37 +27,38 @@ else
 fi
 
 start() {
-	local pid
-
-	if [ ! -f /var/lock/subsys/kcm ]; then
-		msg_starting "Kerberos KCM"
-		busy
-		daemon kcm --detach
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/kcm
-	else
+	if [ -f /var/lock/subsys/kcm ]; then
 		msg_already_running "Kerberos KCM"
+		return
 	fi
+
+	msg_starting "Kerberos KCM"
+	busy
+	daemon kcm --detach
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/kcm
 }
 
 stop() {
-	if [ -f /var/lock/subsys/kcm ]; then
-		msg_stopping "Kerberos KCM"
-		killproc kcm
-		rm -f /var/lock/subsys/kcm >/dev/null 2>&1
-	else
+	if [ ! -f /var/lock/subsys/kcm ]; then
 		msg_not_running "Kerberos KCM"
+		return
 	fi
+
+	msg_stopping "Kerberos KCM"
+	killproc kcm
+	rm -f /var/lock/subsys/kcm >/dev/null 2>&1
 }
 
 condrestart() {
-	if [ -f /var/lock/subsys/kcm ]; then
-		stop
-		start
-	else
+	if [ ! -f /var/lock/subsys/kcm ]; then
 		msg_not_running "Kerberos KCM"
 		RETVAL=$1
+		return
 	fi
+
+	stop
+	start
 }
 
 RETVAL=0
diff --git a/heimdal-kpasswdd.init b/heimdal-kpasswdd.init
index 1be6dd9..19b18de 100755
--- a/heimdal-kpasswdd.init
+++ b/heimdal-kpasswdd.init
@@ -28,37 +28,38 @@ else
 fi
 
 start() {
-	local pid
-
-	if [ ! -f /var/lock/subsys/kpasswdd ]; then
-		msg_starting "Kerberos Password Changing Server"
-		busy
-		daemon --fork kpasswdd $KPASSWDD_PARAMS
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/kpasswdd
-	else
+	if [ -f /var/lock/subsys/kpasswdd ]; then
 		msg_already_running "Kerberos Password Changing Server"
+		return
 	fi
+
+	msg_starting "Kerberos Password Changing Server"
+	busy
+	daemon --fork kpasswdd $KPASSWDD_PARAMS
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/kpasswdd
 }
 
 stop() {
-	if [ -f /var/lock/subsys/kpasswdd ]; then
-		msg_stopping "Kerberos Password Changing Server"
-		killproc kpasswdd
-		rm -f /var/lock/subsys/kpasswdd >/dev/null 2>&1
-	else
+	if [ ! -f /var/lock/subsys/kpasswdd ]; then
 		msg_not_running "Kerberos Password Changing Server"
+		return
 	fi
+
+	msg_stopping "Kerberos Password Changing Server"
+	killproc kpasswdd
+	rm -f /var/lock/subsys/kpasswdd >/dev/null 2>&1
 }
 
 condrestart() {
-	if [ -f /var/lock/subsys/kpasswdd ]; then
-		stop
-		start
-	else
+	if [ ! -f /var/lock/subsys/kpasswdd ]; then
 		msg_not_running "Kerberos Password Changing Server"
 		RETVAL=$1
+		return
 	fi
+
+	stop
+	start
 }
 
 RETVAL=0
diff --git a/heimdal.init b/heimdal.init
index 056352c..ebcff6a 100755
--- a/heimdal.init
+++ b/heimdal.init
@@ -31,37 +31,38 @@ else
 fi
 
 start() {
-	local pid
-
-	if [ ! -f /var/lock/subsys/heimdal ]; then
-		msg_starting "Kerberos KDC"
-		busy
-		daemon kdc --detach $KDC_PARAMS
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/heimdal
-	else
+	if [ -f /var/lock/subsys/heimdal ]; then
 		msg_already_running "Kerberos KDC"
+		return
 	fi
+
+	msg_starting "Kerberos KDC"
+	busy
+	daemon kdc --detach $KDC_PARAMS
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/heimdal
 }
 
 stop() {
-	if [ -f /var/lock/subsys/heimdal ]; then
-		msg_stopping "Kerberos KDC"
-		killproc kdc
-		rm -f /var/lock/subsys/heimdal >/dev/null 2>&1
-	else
+	if [ ! -f /var/lock/subsys/heimdal ]; then
 		msg_not_running "Kerberos KDC"
+		return
 	fi
+
+	msg_stopping "Kerberos KDC"
+	killproc kdc
+	rm -f /var/lock/subsys/heimdal >/dev/null 2>&1
 }
 
 condrestart() {
-	if [ -f /var/lock/subsys/heimdal ]; then
-		stop
-		start
-	else
+	if [ ! -f /var/lock/subsys/heimdal ]; then
 		msg_not_running "Kerberos KDC"
 		RETVAL=$1
+		return
 	fi
+
+	stop
+	start
 }
 
 RETVAL=0
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/heimdal.git/commitdiff/dfcc1bb60f14ae2f06789036da1b779d05de0702