[Pkg-sysvinit-commits] r1059 - in sysvinit/trunk/debian: . initscripts/etc/network/if-up.d

[pere at alioth.debian.org]

Author: pere
Date: 2007-11-18 13:30:15 +0000 (Sun, 18 Nov 2007)
New Revision: 1059

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs
Log:
Acknowledge NMU. (Closes: #433386)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2007-11-18 13:26:09 UTC (rev 1058)
+++ sysvinit/trunk/debian/changelog	2007-11-18 13:30:15 UTC (rev 1059)
@@ -4,9 +4,20 @@
     dependency as it is no longer installed by default.
   * Move /etc/init.d/bootclean to /lib/init/bootclean, as it is not an
     init.d script but a library.
+  * Acknowledge NMU. (Closes: #433386)
 
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 30 Jan 2007 23:14:04 +0100
 
+sysvinit (2.86.ds1-38.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Rework starting of portmap and nfs-common to better fit the new and
+    stricter mount.nfs; in particular, statd must be started for almost all
+    mounts, so start nfs-common even for non-NFSv4 and non-Kerberos mounts.
+    (Closes: #433386)
+
+ -- Steinar H. Gunderson <sesse at debian.org>  Tue, 24 Jul 2007 19:31:27 +0200
+
 sysvinit (2.86.ds1-38) unstable; urgency=medium
 
   * Medium urgency as it solve an RC bug in etch.

Modified: sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs	2007-11-18 13:26:09 UTC (rev 1058)
+++ sysvinit/trunk/debian/initscripts/etc/network/if-up.d/mountnfs	2007-11-18 13:30:15 UTC (rev 1059)
@@ -27,10 +27,9 @@
 
 	exec 9<&0 </etc/fstab
 
-	portmap=no
+	start_nfs=no
 	NETFS=""
 	NETDEV=""
-	gss_or_idmap=no
 	while read DEV MTPT FSTYPE OPTS REST
 	do
 		case "$DEV" in
@@ -47,20 +46,30 @@
 			;;
 		esac
 		case "$FSTYPE" in
-		  nfs|nfs4)
+		  nfs)
+		  	# NFS filsystems normally require statd and portmap. However,
+			# if nolock is set, portmap and statd are not required for this
+			# file system.
 			case "$OPTS" in
 			  nolock|*,nolock|nolock,*|*,nolock,*)
+			  	# no action
 				;;
 			  *)
-				portmap=yes
+				start_nfs=yes
 				;;
 			esac
+
+			# However, Kerberos requires gssd, so start nfs-common anyway.
 			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,*)
-			  	gss_or_idmap=yes
+			  	start_nfs=yes
 				;;
 			esac
 			;;
+		  nfs4)
+			# NFSv4 requires idmapd, so start nfs-common no matter what the options are.
+			start_nfs=yes
+			;;
 		  smbfs|cifs|coda|ncp|ncpfs|ocfs2|gfs)
 			;;
 		  *)
@@ -77,40 +86,18 @@
 				;;
 			esac
 		fi
-		if [ "$FSTYPE" = "nfs4" ]
-		then
-			gss_or_idmap=yes
-		fi
 	done
 
 	exec 0<&9 9<&-
 
 	#
-	# With contemporary portmap packages it is no longer necessary
-	# to start portmap here because the package has its own initscript.
-	# This code will disappear after etch.
-	#
-	if [ "$portmap" = yes ]
-	then
-		if [ -x /sbin/portmap ] && ! pidof portmap >/dev/null 2>&1
-		then
-			if [ -x /etc/init.d/portmap ] 
-			then
-				/etc/init.d/portmap start
-			else
-				start-stop-daemon --start --quiet --oknodo --exec /sbin/portmap
-				sleep 1  # FIXME: Actually synchronize with the process?
-			fi
-		fi
-	fi
-
-	#
-	# Initialize nfs-common (which starts rpc.gssd and/or
-	# rpc.idmapd, and loads the right kernel modules if
+	# Initialize nfs-common (which starts rpc.statd, rpc.gssd
+	# and/or rpc.idmapd, and loads the right kernel modules if
 	# applicable) if we use Kerberos and/or NFSv4 mounts.
 	#
-	if [ "$gss_or_idmap" = yes ] && [ -x /etc/init.d/nfs-common ]
+	if [ "$start_nfs" = yes ] && [ -x /etc/init.d/portmap ] && [ -x /etc/init.d/nfs-common ]
 	then
+		/etc/init.d/portmap start
 		/etc/init.d/nfs-common start
 	fi