From owner-svn-src-all@freebsd.org Sat Aug 4 22:41:19 2018 Return-Path: Delivered-To: svn-src-all@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 373731056120; Sat, 4 Aug 2018 22:41:19 +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 E06658C653; Sat, 4 Aug 2018 22:41:18 +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 A779015BE6; Sat, 4 Aug 2018 22:41:18 +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 w74MfI6h074792; Sat, 4 Aug 2018 22:41:18 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w74MfHpI074788; Sat, 4 Aug 2018 22:41:17 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201808042241.w74MfHpI074788@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Sat, 4 Aug 2018 22:41:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r337340 - in head: etc etc/autofs usr.sbin/autofs usr.sbin/autofs/autofs X-SVN-Group: head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: in head: etc etc/autofs usr.sbin/autofs usr.sbin/autofs/autofs X-SVN-Commit-Revision: 337340 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Aug 2018 22:41:19 -0000 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 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