X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=rpcgssd.init;h=c39ec4e2d485ec4efa75c41c1a3269e05172b3c9;hb=eac4cf5e9c771f717c7af24a8247faf2cc4b8c56;hp=38ae48ce5d23d863a4709a1071ed7295fafdab52;hpb=864fe5d9e78b1651cd25d10647b5a9bfa4af1197;p=packages%2Fnfs-utils.git

diff --git a/rpcgssd.init b/rpcgssd.init
index 38ae48c..c39ec4e 100644
--- a/rpcgssd.init
+++ b/rpcgssd.init
@@ -39,33 +39,35 @@ is_yes "${SECURE_NFS}" || exit 0
 
 start() {
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/gssd ]; then
-		if ! grep -q rpc_pipefs /proc/mounts ; then
-			modprobe sunrpc >/dev/null 2>&1
-			run_cmd "Mounting /var/lib/nfs/rpc_pipefs filesystem" \
-				mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
-		fi
-		# Load rpcsec modules
-		for i in ${SECURE_NFS_MODS} ; do 
-			_modprobe single die $i
-		done
-		msg_starting "RPC gssd"
-		daemon rpc.gssd $RPCGSSOPTIONS
-		RETVAL=$?
-		[ $RETVAL = 0 ] && touch /var/lock/subsys/gssd
-	else
+	if [ -f /var/lock/subsys/gssd ]; then
 		msg_already_running "RPC gssd"
+		return
+	fi
+
+	if ! grep -q rpc_pipefs /proc/mounts; then
+		modprobe sunrpc >/dev/null 2>&1
+		run_cmd "Mounting /var/lib/nfs/rpc_pipefs filesystem" \
+			mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
 	fi
+	# Load rpcsec modules
+	for i in ${SECURE_NFS_MODS}; do
+		_modprobe single die $i
+	done
+	msg_starting "RPC gssd"
+	daemon rpc.gssd $RPCGSSOPTIONS
+	RETVAL=$?
+	[ $RETVAL = 0 ] && touch /var/lock/subsys/gssd
 }
 
 stop() {
-	if [ -f /var/lock/subsys/gssd ]; then
-		msg_stopping "RPC gssd"
-		killproc rpc.gssd
-		rm -f /var/lock/subsys/gssd
-	else
+	if [ ! -f /var/lock/subsys/gssd ]; then
 		msg_not_running "RPC gssd"
+		return
 	fi
+
+	msg_stopping "RPC gssd"
+	killproc rpc.gssd
+	rm -f /var/lock/subsys/gssd
 }
 
 # See how we were called.
@@ -77,14 +79,14 @@ case "$1" in
   stop)
   	stop
 	;;
-  status)
-	status rpc.gssd
-	RETVAL=$?
-	;;
   restart|reload)
 	stop
 	start
 	;;
+  status)
+	status rpc.gssd
+	RETVAL=$?
+	;;
   *)
 	msg_usage "$0 {start|stop|restart|status}"
 	exit 1