--- rc.inet2	2004-06-07 08:08:49.000000000 +0200
+++ rc.inet2.fixed	2004-10-23 12:38:20.000000000 +0200
@@ -16,15 +16,18 @@
 # At this point, we are ready to talk to The World...
 
 
+# Load the RPC portmapper if /etc/rc.d/rc.portmap is executable
+# so we can mount NFS volumes without hanging mount(8)
+if [ -x /etc/rc.d/rc.portmap ]; then
+  . /etc/rc.d/rc.portmap start
+fi
+
 # Mount remote (NFS) filesystems:
 if cat /etc/fstab | grep -v '^#' | grep -w nfs 1> /dev/null 2> /dev/null ; then
-  # Start the RPC portmapper if we find NFS volumes defined in /etc/fstab,
-  # since it will need to be running in order to mount them.  If portmap
-  # is not running, attempting to mount an NFS partition will cause mount
-  # to hang.  Keep this in mind if you plan to mount unlisted partitions...
-  if [ -x /etc/rc.d/rc.portmap ]; then
-    . /etc/rc.d/rc.portmap start
-  else
+  # RPC portmapper should be running already if /etc/rc.d/rc.portmap is
+  # executable. If it's not, attempting to mount an NFS partition will cause
+  # mount to hang.  Keep this in mind if you plan to mount unlisted partitions...
+  if [ ! -x /etc/rc.d/rc.portmap ]; then
     # Warn about a possible NFS problem.  It's also possible to mount NFS partitions
     # without rpc.portmap by using '-o nolock' (not a good idea in most cases).
     echo "WARNING:  NFS partitions found in /etc/fstab, but /etc/rc.d/rc.portmap is"
@@ -39,12 +42,6 @@
   /sbin/mount -v -t nfs
 fi
 
-# Load the RPC portmapper if /etc/rc.d/rc.portmap is executable.
-# This might be needed to mount NFS partitions that are not listed in /etc/fstab.
-if [ -x /etc/rc.d/rc.portmap ]; then
-  . /etc/rc.d/rc.portmap start
-fi
-
 # Mount remote (SMB) filesystems:
 if cat /etc/fstab | grep -v '^#' | grep -w smbfs 1> /dev/null 2> /dev/null ; then
   echo "Mounting remote (SMB) file systems:  /sbin/mount -a -t smbfs"