From owner-svn-src-head@freebsd.org Tue Sep 18 00:32:12 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0056710AB156; Tue, 18 Sep 2018 00:32:11 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A7FC1732B7; Tue, 18 Sep 2018 00:32:11 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A2E8F18773; Tue, 18 Sep 2018 00:32:11 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8I0WBSt025539; Tue, 18 Sep 2018 00:32:11 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8I0WBPo025537; Tue, 18 Sep 2018 00:32:11 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201809180032.w8I0WBPo025537@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Tue, 18 Sep 2018 00:32:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r338742 - in head: etc usr.sbin/amd/amd X-SVN-Group: head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: in head: etc usr.sbin/amd/amd X-SVN-Commit-Revision: 338742 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Sep 2018 00:32:12 -0000 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