Don't require operators to override the list of network filesystem

types (networkfs_types) with a version that includes the original
list.

This increases the scope for user error and also means that systems with
networkfs_types set in /etc/rc.conf will not benefit from changes to the
list in /etc/defaults/rc.conf on upgrade.

Instead, store the default list in /etc/rc itself and allow the operator
to append to that list by specifying her own list in networkfs_types.

Rename networkfs_types to extra_netfs_types accordingly, as the new name
better describes the purpose of the variable.  Default the value to
'NO'.

1 files changed, 11 insertions, 3 deletions

diff --git a/etc/rc b/etc/rc
index fc784b9..3422f8c 100644
--- a/etc/rc
+++ b/etc/rc
@@ -267,10 +267,18 @@ esac
 
 umount -a >/dev/null 2>&1
 
+# Set up the list of network filesystem types for which mounting should be
+# delayed until after network initialization.
+networkfs_types='nfs:NFS smbfs:SMB portalfs:PORTAL'
+case ${extra_netfs_types} in
+[Nn][Oo])
+	;;
+*)
+	networkfs_types="${networkfs_types} ${extra_netfs_types}"
+	;;
+esac
+
 # Mount everything except nfs filesystems.
-if [ -z "${networkfs_types}" ]; then
-	networkfs_types='nfs:NFS smbfs:SMB portalfs:PORTAL'
-fi
 mount_excludes='no'
 for i in ${networkfs_types}; do
 	fstype=${i%:*}