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, 12 insertions, 4 deletions

diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 8b4b79e..49d022a 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -686,16 +686,24 @@ If set to
 the system will attempt to run
 .Xr fsck 8
 in the background where possible.
-.It Va networkfs_types
+.It Va extra_netfs_types
 .Pq Vt str
-A whitespace-separated list of network filesystem descriptor pairs,
+If set to something other than
+.Dq NO
+(the default),
+this variable extends the list of filesystem types
+for which automatic mounting at startup by
+.Xr rc 8
+should be delayed until the network is initialized.
+It should contain
+a whitespace-separated list of network filesystem descriptor pairs,
 each consisting of a filesystem type as passed to
 .Xr mount 8
 and a human-readable, one-word description,
 joined with a colon
 .Pq Sq \&: .
-This list can be extended as required to accommodate
-third-party filesystem support.
+Extending the default list in this way is only necessary
+when third party filesystem types are used.
 .It Va syslogd_enable
 .Pq Vt bool
 If set to