svn commit: r337340 - in head: etc etc/autofs usr.sbin/autofs usr.sbin/autofs/autofs

[Brad Davis]

Author: brd
Date: Sat Aug  4 22:41:17 2018
New Revision: 337340
URL: https://svnweb.freebsd.org/changeset/base/337340

Log:
  Move autofs related configs to usr.sbin/autofs/
  
  This is prep for pkgbase to have config files tagged as such.
  
  Approved by:	will (mentor)
  Differential Revision:	https://reviews.freebsd.org/D16492

Added:
  head/usr.sbin/autofs/auto_master
     - copied unchanged from r337339, head/etc/auto_master
  head/usr.sbin/autofs/autofs/
     - copied from r337339, head/etc/autofs/
Deleted:
  head/etc/auto_master
  head/etc/autofs/
Modified:
  head/etc/Makefile
  head/usr.sbin/autofs/Makefile
  head/usr.sbin/autofs/autofs/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Sat Aug  4 22:31:29 2018	(r337339)
+++ head/etc/Makefile	Sat Aug  4 22:41:17 2018	(r337340)
@@ -190,9 +190,6 @@ distribution:
 		echo "./var/db/services.db type=file mode=0644 uname=root gname=wheel"; \
 	) | ${METALOG.add}
 .endif
-.if ${MK_AUTOFS} != "no"
-	${_+_}cd ${.CURDIR}/autofs; ${MAKE} install
-.endif
 .if ${MK_BLUETOOTH} != "no"
 	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
 .endif

Modified: head/usr.sbin/autofs/Makefile
==============================================================================
--- head/usr.sbin/autofs/Makefile	Sat Aug  4 22:31:29 2018	(r337339)
+++ head/usr.sbin/autofs/Makefile	Sat Aug  4 22:41:17 2018	(r337340)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+CONFS=	auto_master
 PACKAGE=autofs
 PROG=	automountd
 SRCS=	automount.c
@@ -29,5 +30,7 @@ LINKS=	${BINDIR}/automountd ${BINDIR}/automount
 LINKS+=	${BINDIR}/automountd ${BINDIR}/autounmountd
 
 .PATH:	${MOUNT}
+
+SUBDIR=	autofs
 
 .include <bsd.prog.mk>

Copied: head/usr.sbin/autofs/auto_master (from r337339, head/etc/auto_master)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.sbin/autofs/auto_master	Sat Aug  4 22:41:17 2018	(r337340, copy of r337339, head/etc/auto_master)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+#
+# Automounter master map, see auto_master(5) for details.
+#
+/net		-hosts		-nobrowse,nosuid,intr
+# When using the -media special map, make sure to edit devd.conf(5)
+# to move the call to "automount -c" out of the comments section.
+#/media		-media		-nosuid,noatime
+#/-		-noauto

Modified: head/usr.sbin/autofs/autofs/Makefile
==============================================================================
--- head/etc/autofs/Makefile	Sat Aug  4 22:31:29 2018	(r337339)
+++ head/usr.sbin/autofs/autofs/Makefile	Sat Aug  4 22:41:17 2018	(r337340)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-FILES=		include_ldap \
+CONFS=		include_ldap \
 		include_nis \
 		include_nis_nullfs \
 		special_hosts \
@@ -9,7 +9,7 @@ FILES=		include_ldap \
 		special_null
 
 NO_OBJ=
-FILESDIR=	/etc/autofs
-FILESMODE=	755
+CONFDIR=	/etc/autofs
+CONFMODE=	755
 
 .include <bsd.prog.mk>