X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-kernel-server.init;h=d500ebcae56679cfd17f37159ddb66873d0c1e11;hp=e80026777b279646d84654fd3bfa06f3bb3caf62;hb=981d25a37fe4a71eddd162672a658da223453985;hpb=8b5864873dbaffb59d510e54359d09b3c79f3566

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index e800267..d500ebc 100755
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -25,21 +25,36 @@ PREFIX=/usr
 DEFAULTFILE=/etc/default/nfs-kernel-server
 RPCNFSDCOUNT=8
 RPCMOUNTDOPTS=
+PROCNFSD_MOUNTPOINT=/proc/fs/nfsd
 if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
 fi
 
+do_modprobe() {
+	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
+}
+
 # See how we were called.
 case "$1" in
   start)
 	cd /	# daemons should have root dir as cwd
 	if grep -q '^/' /etc/exports
 	then
-	        # Having the 'nfsd' filesystem mounted (if available)
-	        # make client authentication more reliable.
-	        if [ -d /proc/fs/nfsd -a ! -f /proc/fs/nfsd/exports ]
-		then mount -t nfsd nfsd /proc/fs/nfsd
-		fi
+		do_modprobe nfsd
+		do_mount nfsd $PROCNFSD_MOUNTPOINT || true
 		printf "Exporting directories for $DESC..."
 		$PREFIX/sbin/exportfs -r
 		echo "done."
@@ -85,7 +100,6 @@ case "$1" in
 
 	printf "Unexporting directories for $DESC..."
 	$PREFIX/sbin/exportfs -au
-	if [ -f /proc/fs/nfsd/exports ] ; then umount /proc/fs/nfsd; fi
 	echo "done."
 	;;