X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.init;h=76ceaca2819ff141590043761fae63c09d21b17a;hp=cd74730f7e2b22f538ed9e25028ed7f930afe669;hb=bc700ac52d47969d873499e3050d028335eda14d;hpb=981d25a37fe4a71eddd162672a658da223453985

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index cd74730..76ceaca 100755
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -18,9 +18,12 @@ 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=
+GSSD_PIDFILE=/var/run/rpc.gssd.pid
 PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs
+RPCGSSDOPTS=
 if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
 fi
@@ -47,26 +50,67 @@ 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
-[ -x /usr/sbin/rpc.idmapd ] || [ "$NEED_IDMAPD" = no ] || exit 0
+[ -x $PREFIX/sbin/rpc.lockd ] || [ "$NEED_LOCKD"  = no ] || exit 0
+[ -x /usr/sbin/rpc.idmapd   ] || [ "$NEED_IDMAPD" = no ] || exit 0
+[ -x /usr/sbin/rpc.gssd     ] || [ "$NEED_GSSD"   = no ] || exit 0
 
 do_modprobe() {
-	modprobe -q $1 || true
+    modprobe -q "$1" || true
 }
 
 do_mount() {
-	if ! grep -E -qs "$1\$" /proc/filesystems
-	then
-		return 1
-	fi
-	if ! mountpoint -q $2
-	then
-		mount -t $1 $3 $1 $2
-		return
-	fi
-	return 0
+    if ! grep -E -qs "$1\$" /proc/filesystems
+    then
+	return 1
+    fi
+    if ! mountpoint -q "$2"
+    then
+	mount -t "$1" "$1" "$2"
+	return
+    fi
+    return 0
 }
 
 # See how we were called.
@@ -83,15 +127,27 @@ case "$1" in
 	    start-stop-daemon --start --quiet \
 		--exec $PREFIX/sbin/rpc.lockd  || true
 	fi
-	if [ "$NEED_IDMAPD" = yes ]
+	if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]
 	then
 	    do_modprobe nfs
-	    if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT;
+	    do_modprobe nfs4
+	    if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT
 	    then
-		printf " idmapd"
-		start-stop-daemon --start --quiet \
-			--make-pidfile --pidfile $IDMAPD_PIDFILE \
-			--exec /usr/sbin/rpc.idmapd
+	    	if [ "$NEED_IDMAPD" = yes ]
+		then
+		    printf " idmapd"
+		    start-stop-daemon --start --quiet \
+			    --make-pidfile --pidfile $IDMAPD_PIDFILE \
+			    --exec /usr/sbin/rpc.idmapd
+		fi
+		if [ "$NEED_GSSD" = yes ]
+		then
+		    do_modprobe rpcsec_gss_krb5
+		    printf " gssd"
+		    start-stop-daemon --start --quiet \
+			    --make-pidfile --pidfile $GSSD_PIDFILE \
+			    --exec /usr/sbin/rpc.gssd -- $RPCGSSDOPTS
+		fi
 	    fi
 	fi
 	echo "."
@@ -99,22 +155,31 @@ case "$1" in
 
   stop)
 	printf "Stopping $DESC:"
+	if [ "$NEED_GSSD" = yes ]
+	then
+	    printf " gssd"
+	    start-stop-daemon --stop --oknodo --quiet \
+		    --name rpc.gssd
+	    rm -f $GSSD_PIDFILE
+	fi
 	if [ "$NEED_IDMAPD" = yes ]
 	then
 	    printf " idmapd"
 	    start-stop-daemon --stop --oknodo --quiet \
-		--name rpc.idmapd --user 0
+		--name rpc.idmapd
 	    rm -f $IDMAPD_PIDFILE
 	fi
 	if [ "$NEED_LOCKD" = yes ]
 	then
 	    printf " lockd"
 	    start-stop-daemon --stop --oknodo --quiet \
-		--name rpc.lockd --user 0  || true
+		--name rpc.lockd || true
+	else
+	    pkill -KILL -u root -x lockd || true
 	fi
 	printf " statd"
 	start-stop-daemon --stop --oknodo --quiet \
-	    --name rpc.statd --user 0
+	    --name rpc.statd
 	echo "."
 	;;