Date: Thu, 1 Jan 2015 15:48:13 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r276504 - in stable/10/etc: defaults rc.d Message-ID: <201501011548.t01FmDke090600@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Thu Jan 1 15:48:12 2015 New Revision: 276504 URL: https://svnweb.freebsd.org/changeset/base/276504 Log: MFC r274965: Make it possible to specify flags for autofs daemons in rc.conf. Sponsored by: The FreeBSD Foundation Modified: stable/10/etc/defaults/rc.conf stable/10/etc/rc.d/automount Directory Properties: stable/10/ (props changed) Modified: stable/10/etc/defaults/rc.conf ============================================================================== --- stable/10/etc/defaults/rc.conf Thu Jan 1 15:45:22 2015 (r276503) +++ stable/10/etc/defaults/rc.conf Thu Jan 1 15:48:12 2015 (r276504) @@ -326,7 +326,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: stable/10/etc/rc.d/automount ============================================================================== --- stable/10/etc/rc.d/automount Thu Jan 1 15:45:22 2015 (r276503) +++ stable/10/etc/rc.d/automount Thu Jan 1 15:48:12 2015 (r276504) @@ -18,7 +18,7 @@ required_modules="autofs" automount_start() { - /usr/sbin/automount + /usr/sbin/automount ${automount_flags} } automount_stop()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501011548.t01FmDke090600>