diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2014-11-24 20:10:12 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2014-11-24 20:10:12 +0000 |
| commit | 1f12581f2772c0bedc7f4cd702a6f7dbe36a965b (patch) | |
| tree | c138fde8a05cb61ce1cd531cd2acf78553452547 /etc | |
| parent | a58b298927c79521aabe2947b2232d48833aca85 (diff) | |
| parent | 519195e82037868021873d1494e8a01e6a549b50 (diff) | |
| download | src-1f12581f2772c0bedc7f4cd702a6f7dbe36a965b.tar.gz src-1f12581f2772c0bedc7f4cd702a6f7dbe36a965b.zip | |
Merge ^/head r274961 through r274978.
Notes
Notes:
svn path=/projects/clang350-import/; revision=274979
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/defaults/rc.conf | 5 | ||||
| -rw-r--r-- | etc/rc.d/automount | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 48c772bd93a2..645a2542848b 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -317,7 +317,10 @@ amd_enable="NO" # Run amd service with $amd_flags (or NO). amd_program="/usr/sbin/amd" # path to amd, if you want a different one. amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map" amd_map_program="NO" # Can be set to "ypcat -k amd.master" -autofs_enable="NO" # Run automountd(8) +autofs_enable="NO" # Run autofs daemons. +automount_flags="" # Flags to automount(8) (if autofs enabled). +automountd_flags="" # Flags to automountd(8) (if autofs enabled). +autounmountd_flags="" # Flags to autounmountd(8) (if autofs enabled). nfs_client_enable="NO" # This host is an NFS client (or NO). nfs_access_cache="60" # Client cache timeout in seconds nfs_server_enable="NO" # This host is an NFS server (or NO). diff --git a/etc/rc.d/automount b/etc/rc.d/automount index 63bda42ceeb7..c39469452a89 100644 --- a/etc/rc.d/automount +++ b/etc/rc.d/automount @@ -18,7 +18,7 @@ required_modules="autofs" automount_start() { - /usr/sbin/automount + /usr/sbin/automount ${automount_flags} } automount_stop() |