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'.

2 files changed, 13 insertions, 5 deletions

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 1f759af..9d53cae 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -36,8 +36,8 @@ script_name_sep=" "	# Change if your startup scripts' names contain spaces
 rc_conf_files="/etc/rc.conf /etc/rc.conf.local"
 fsck_y_enable="NO"	# Set to YES to do fsck -y if the initial preen fails.
 background_fsck="YES"	# Attempt to run fsck in the background where possible.
-networkfs_types="nfs:NFS smbfs:SMB portalfs:PORTAL"	# List of network
-			# filesystem types for delayed mount at startup.
+extra_netfs_types="NO"	# List of network extra filesystem types for delayed
+			# mount at startup (or NO).
 
 ##############################################################
 ###  Network configuration sub-section  ######################
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%:*}