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.
This commit is contained in:
parent
c25f3cbff7
commit
25c01919eb
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=115585
@ -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).
|
||||
|
||||
|
@ -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
|
||||
|
@ -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#*:}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user