svn commit: r338742 - in head: etc usr.sbin/amd/amd

[Brad Davis]

Author: brd
Date: Tue Sep 18 00:32:10 2018
New Revision: 338742
URL: https://svnweb.freebsd.org/changeset/base/338742

Log:
  Move amd.map to usr.sbin/amd/amd/
  
  This leverages CONFS to handle the install of the config file.
  
  Approved by:	re (gjb), will (mentor)
  Differential Revision:	https://reviews.freebsd.org/D17159

Added:
  head/usr.sbin/amd/amd/amd.map
     - copied unchanged from r338741, head/etc/amd.map
Deleted:
  head/etc/amd.map
Modified:
  head/etc/Makefile
  head/usr.sbin/amd/amd/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Tue Sep 18 00:25:00 2018	(r338741)
+++ head/etc/Makefile	Tue Sep 18 00:32:10 2018	(r338742)
@@ -27,10 +27,6 @@ BIN1=	\
 
 # NB: keep these sorted by MK_* knobs
 
-.if ${MK_AMD} != "no"
-BIN1+= amd.map
-.endif
-
 .if ${MK_LOCATE} != "no"
 BIN1+=	${SRCTOP}/usr.bin/locate/locate/locate.rc
 .endif

Modified: head/usr.sbin/amd/amd/Makefile
==============================================================================
--- head/usr.sbin/amd/amd/Makefile	Tue Sep 18 00:25:00 2018	(r338741)
+++ head/usr.sbin/amd/amd/Makefile	Tue Sep 18 00:32:10 2018	(r338742)
@@ -10,6 +10,7 @@
 
 .PATH:	${SRCTOP}/contrib/amd/amd
 
+CONFS=	amd.map
 PROG=	amd
 MAN=	amd.8
 SRCS=	am_ops.c amd.c amfs_auto.c amfs_direct.c amfs_error.c amfs_generic.c

Copied: head/usr.sbin/amd/amd/amd.map (from r338741, head/etc/amd.map)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.sbin/amd/amd/amd.map	Tue Sep 18 00:32:10 2018	(r338742, copy of r338741, head/etc/amd.map)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+#
+/defaults       type:=host;fs:=${autodir}/${rhost}/host;rhost:=${key}
+*               opts:=rw,grpid,resvport,vers=3,proto=tcp,nosuid,nodev