[packages/libvirt] unify init script

[glen]

commit 3f6e33ef4f4e45f09ccf9d839631098c31a2a62c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Jan 4 14:36:11 2013 +0200

    unify init script

 libvirt.init | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)
---
diff --git a/libvirt.init b/libvirt.init
index 09dd7fe..fcf7ebc 100755
--- a/libvirt.init
+++ b/libvirt.init
@@ -27,27 +27,28 @@ if [ -f /etc/sysconfig/libvirtd ] ; then
 	. /etc/sysconfig/libvirtd
 fi
 
-
 start() {
 	if [ ! -f /var/lock/subsys/libvirtd ]; then
-		umask 077
-		msg_starting libvirtd
-		daemon libvirtd --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/libvirtd
-	else
-		msg_already_running libvirtd
+		msg_already_running "libvirtd"
+		return
 	fi
+
+	umask 077
+	msg_starting libvirtd
+	daemon libvirtd --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/libvirtd
 }
 
 stop() {
-	if [ -f /var/lock/subsys/libvirtd ]; then
-		msg_stopping libvirtd
-		killproc libvirtd
-		rm -f /var/lock/subsys/libvirtd
-	else
-		msg_not_running libvirtd
+	if [ ! -f /var/lock/subsys/libvirtd ]; then
+		msg_not_running "libvirtd"
+		return
 	fi
+
+	msg_stopping "libvirtd"
+	killproc libvirtd
+	rm -f /var/lock/subsys/libvirtd
 }
 
 reload() {
@@ -63,13 +64,14 @@ reload() {
 }
 
 condrestart() {
-	if [ -f /var/lock/subsys/libvirtd ]; then
-		stop
-		start
-	else
+	if [ ! -f /var/lock/subsys/libvirtd ]; then
 		msg_not_running libvirtd
 		RETVAL=$1
+		return
 	fi
+
+	stop
+	start
 }
 
 RETVAL=0
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libvirt.git/commitdiff/6a9a4b425fd46e6a0d3a54bbbbf13ff913cc996b