X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.init;h=8501601dcfb2e7d4e8caaa74304bc87ae0139fd5;hp=b6fb962e8692b4125c475afe510cc11938e936b6;hb=6b6945c52f6dbcdb2768e0b43ef3a865fe89b6ba;hpb=cd99a9c42bf395e228c6a070634e111f5da019cd

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
old mode 100755
new mode 100644
index b6fb962..8501601
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -9,8 +9,6 @@
 #	       locking functionality.
 #
 
-set -e
-
 # What is this?
 DESC="NFS common utilities"
 
@@ -18,9 +16,9 @@ DESC="NFS common utilities"
 DEFAULTFILE=/etc/default/nfs-common
 PREFIX=
 NEED_LOCKD=
-NEED_IDMAPD=yes
+NEED_IDMAPD=
 IDMAPD_PIDFILE=/var/run/rpc.idmapd.pid
-NEED_GSSD=yes
+NEED_GSSD=
 GSSD_PIDFILE=/var/run/rpc.gssd.pid
 PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs
 RPCGSSDOPTS=
@@ -28,6 +26,8 @@ if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
 fi
 
+. /lib/lsb/init-functions
+
 # Determine whether lockd daemon is required.
 case "$NEED_LOCKD" in
 yes|no)	;;
@@ -50,6 +50,46 @@ yes|no)	;;
     ;;
 esac
 
+#
+# Parse the fstab file, and determine whether we need idmapd and gssd. (The
+# /etc/defaults settings, if any, will override our autodetection.) This code
+# is partially adapted from the mountnfs.sh script in the sysvinit package.
+#
+AUTO_NEED_IDMAPD=no
+AUTO_NEED_GSSD=no
+
+exec 9<&0 </etc/fstab
+
+while read DEV MTPT FSTYPE OPTS REST
+do
+    if [ "$FSTYPE" = "nfs4" ]; then
+        AUTO_NEED_IDMAPD=yes
+    fi
+    case "$OPTS" in
+        sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*)
+	    AUTO_NEED_GSSD=yes
+	;;
+    esac
+done
+
+exec 0<&9 9<&-
+
+case "$NEED_IDMAPD" in
+    yes|no)	
+        ;;
+    *)
+        NEED_IDMAPD=$AUTO_NEED_IDMAPD
+	;;
+esac
+
+case "$NEED_GSSD" in
+    yes|no)	
+        ;;
+    *)
+        NEED_GSSD=$AUTO_NEED_GSSD
+	;;
+esac
+
 # Exit if required binaries are missing.
 [ -x $PREFIX/sbin/rpc.statd ] || exit 0
 [ -x $PREFIX/sbin/rpc.lockd ] || [ "$NEED_LOCKD"  = no ] || exit 0
@@ -73,70 +113,155 @@ do_mount() {
     return 0
 }
 
+do_umount() {
+    if mountpoint -q "$1"
+    then
+	umount "$1"
+    fi
+    return 0
+}
+
 # See how we were called.
 case "$1" in
   start)
-	cd /	# daemons should have root dir as cwd
-	printf "Starting $DESC:"
-	printf " statd"
-	start-stop-daemon --start --quiet \
+	log_daemon_msg "Starting $DESC"
+
+	log_progress_msg "statd"
+	start-stop-daemon --start --oknodo --quiet \
 	    --exec $PREFIX/sbin/rpc.statd -- $STATDOPTS
+	if [ $? != 0 ]; then
+	    log_end_msg $?
+	    exit $?
+	fi
+
 	if [ "$NEED_LOCKD" = yes ]
 	then
-	    printf " lockd"
-	    start-stop-daemon --start --quiet \
-		--exec $PREFIX/sbin/rpc.lockd  || true
+	    log_progress_msg "lockd"
+	    start-stop-daemon --start --oknodo --quiet \
+		--exec $PREFIX/sbin/rpc.lockd
+	    if [ $? != 0 ]; then
+	        log_end_msg $?
+	        exit $?
+            fi
 	fi
 	if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]
 	then
 	    do_modprobe nfs
+	    do_modprobe nfs4
 	    if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT
 	    then
 	    	if [ "$NEED_IDMAPD" = yes ]
 		then
-		    printf " idmapd"
-		    start-stop-daemon --start --quiet \
+	            log_progress_msg "idmapd"
+		    start-stop-daemon --start --oknodo --quiet \
 			    --make-pidfile --pidfile $IDMAPD_PIDFILE \
 			    --exec /usr/sbin/rpc.idmapd
+	            if [ $? != 0 ]; then
+        	        log_end_msg $?
+        	        exit $?
+                    fi
 		fi
 		if [ "$NEED_GSSD" = yes ]
 		then
-		    printf " gssd"
-		    start-stop-daemon --start --quiet \
+		    do_modprobe rpcsec_gss_krb5
+	            log_progress_msg "gssd"
+		    start-stop-daemon --start --oknodo --quiet \
 			    --make-pidfile --pidfile $GSSD_PIDFILE \
 			    --exec /usr/sbin/rpc.gssd -- $RPCGSSDOPTS
+	            if [ $? != 0 ]; then
+        	        log_end_msg $?
+        	        exit $?
+                    fi
 		fi
 	    fi
 	fi
-	echo "."
+	log_end_msg 0
 	;;
 
   stop)
-	printf "Stopping $DESC:"
+	log_daemon_msg "Stopping $DESC"
+
 	if [ "$NEED_GSSD" = yes ]
 	then
-	    printf " gssd"
+	    log_progress_msg "gssd"
 	    start-stop-daemon --stop --oknodo --quiet \
-		    --name rpc.gssd --user 0
+		    --name rpc.gssd
+	    if [ $? != 0 ]; then
+                log_end_msg $?
+                exit $?
+            fi
 	    rm -f $GSSD_PIDFILE
 	fi
 	if [ "$NEED_IDMAPD" = yes ]
 	then
-	    printf " idmapd"
+	    log_progress_msg "idmapd"
 	    start-stop-daemon --stop --oknodo --quiet \
-		--name rpc.idmapd --user 0
+		--name rpc.idmapd
+	    if [ $? != 0 ]; then
+                log_end_msg $?
+                exit $?
+            fi
 	    rm -f $IDMAPD_PIDFILE
 	fi
 	if [ "$NEED_LOCKD" = yes ]
 	then
-	    printf " lockd"
+	    log_progress_msg "lockd"
 	    start-stop-daemon --stop --oknodo --quiet \
-		--name rpc.lockd --user 0  || true
+		--name rpc.lockd
+	    if [ $? != 0 ]; then
+                log_end_msg $?
+                exit $?
+            fi
+	else
+	    pkill -KILL -u root -x lockd || true
 	fi
-	printf " statd"
+	log_progress_msg "statd"
 	start-stop-daemon --stop --oknodo --quiet \
-	    --name rpc.statd --user 0
-	echo "."
+	    --name rpc.statd
+	if [ $? != 0 ]; then
+            log_end_msg $?
+            exit $?
+        fi
+	do_umount $PIPEFS_MOUNTPOINT 2>/dev/null || true
+	log_end_msg 0
+	;;
+
+  status)
+	if ! pidof rpc.statd >/dev/null
+	then
+	    echo "rpc.statd not running"
+	    exit 3
+	fi
+
+	if [ "$NEED_GSSD" = yes ]
+	then
+            if [ ! -f "$GSSD_PIDFILE" ] || ! pidof rpc.gssd >/dev/null
+	    then
+		echo "rpc.statd running, but rpc.gssd halted"
+		exit 3
+	    fi
+	fi
+
+	if [ "$NEED_LOCKD" = yes ]
+	then
+	    if ! pidof rpc.lockd >/dev/null
+	    then
+		echo "rpc.statd running, but rpc.lockd halted"
+		exit 3
+	    fi
+	fi
+	    
+	if [ "$NEED_IDMAPD" = yes ]
+	then
+            if [ ! -f "$IDMAPD_PIDFILE" ] || ! pidof rpc.idmapd >/dev/null
+	    then
+		echo "rpc.statd running, but rpc.idmapd halted"
+		exit 3
+	    fi
+	fi
+
+	echo "rpc.statd running"
+	exit 0
 	;;
 
   restart | force-reload)
@@ -146,7 +271,7 @@ case "$1" in
 	;;
 
   *)
-	echo "Usage: nfs-common {start|stop|restart}"
+	log_success_msg "Usage: nfs-common {start|stop|status|restart}"
 	exit 1
 	;;
 esac