Move networkfs_types from mountcritlocal into defaults/rc.conf as netfs_types.

Also add logic into mountcritremote to add extra_netfs_types to the list.

This unbreaks putting smbfs, portalfs and now nwfs in fstab.

3 files changed, 12 insertions, 4 deletions

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 37e449f..594f55b 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -44,6 +44,7 @@ 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.
 background_fsck_delay="60" # Time to wait (seconds) before starting the fsck.
+netfs_types="nfs:NFS smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems.
 extra_netfs_types="NO"	# List of network extra filesystem types for delayed
 			# mount at startup (or NO).
 
diff --git a/etc/rc.d/mountcritlocal b/etc/rc.d/mountcritlocal
index 7f35666..2afddd7 100755
--- a/etc/rc.d/mountcritlocal
+++ b/etc/rc.d/mountcritlocal
@@ -20,18 +20,17 @@ mountcritlocal_start()
 	FreeBSD)
 		# 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 nwfs:NWFS'
 		case ${extra_netfs_types} in
 		[Nn][Oo])
 			;;
 		*)
-			networkfs_types="${networkfs_types} ${extra_netfs_types}"
+			netfs_types="${netfs_types} ${extra_netfs_types}"
 			;;
 		esac
 
 		# Mount everything except nfs filesystems.
 		mount_excludes='no'
-		for i in ${networkfs_types}; do
+		for i in ${netfs_types}; do
 			fstype=${i%:*}
 			mount_excludes="${mount_excludes}${fstype},"
 		done
diff --git a/etc/rc.d/mountcritremote b/etc/rc.d/mountcritremote
index 0561317..d64337f 100755
--- a/etc/rc.d/mountcritremote
+++ b/etc/rc.d/mountcritremote
@@ -56,7 +56,15 @@ mountcritremote_start()
 		echo '.'
 
 		# Mount other network filesystems if present in /etc/fstab.
-		for i in ${networkfs_types}; do
+		case ${extra_netfs_types} in
+		[Nn][Oo])
+			;;
+		*)
+			netfs_types="${netfs_types} ${extra_netfs_types}"
+			;;
+		esac
+
+		for i in ${netfs_types}; do
 			fstype=${i%:*}
 			fsdecr=${i#*:}