svn commit: r274965 - in head/etc: defaults rc.d

Edward Tomasz Napierala trasz at FreeBSD.org
Mon Nov 24 13:02:40 UTC 2014


Author: trasz
Date: Mon Nov 24 13:02:39 2014
New Revision: 274965
URL: https://svnweb.freebsd.org/changeset/base/274965

Log:
  Make it possible to specify flags for autofs daemons in rc.conf.
  
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/etc/defaults/rc.conf
  head/etc/rc.d/automount

Modified: head/etc/defaults/rc.conf
==============================================================================
--- head/etc/defaults/rc.conf	Mon Nov 24 12:53:56 2014	(r274964)
+++ head/etc/defaults/rc.conf	Mon Nov 24 13:02:39 2014	(r274965)
@@ -317,7 +317,10 @@ amd_enable="NO"			# Run amd service with
 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).

Modified: head/etc/rc.d/automount
==============================================================================
--- head/etc/rc.d/automount	Mon Nov 24 12:53:56 2014	(r274964)
+++ head/etc/rc.d/automount	Mon Nov 24 13:02:39 2014	(r274965)
@@ -18,7 +18,7 @@ required_modules="autofs"
 automount_start()
 {
 
-	/usr/sbin/automount
+	/usr/sbin/automount ${automount_flags}
 }
 
 automount_stop()


More information about the svn-src-all mailing list