From owner-svn-src-head@freebsd.org  Sun Sep  2 15:53:57 2018
Return-Path: <owner-svn-src-head@freebsd.org>
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 E936FFF2C92;
 Sun,  2 Sep 2018 15:53:56 +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 912267DA15;
 Sun,  2 Sep 2018 15:53:56 +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 865FF1B64C;
 Sun,  2 Sep 2018 15:53:56 +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 w82FrubR069959;
 Sun, 2 Sep 2018 15:53:56 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w82FruQo069958;
 Sun, 2 Sep 2018 15:53:56 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201809021553.w82FruQo069958@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org
 using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Sun, 2 Sep 2018 15:53:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r338429 - head/usr.sbin/periodic
X-SVN-Group: head
X-SVN-Commit-Author: brd
X-SVN-Commit-Paths: head/usr.sbin/periodic
X-SVN-Commit-Revision: 338429
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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Sep 2018 15:53:57 -0000

Author: brd
Date: Sun Sep  2 15:53:56 2018
New Revision: 338429
URL: https://svnweb.freebsd.org/changeset/base/338429

Log:
  Move defaults/periodic.conf back to a config file.
  
  Ths prevents etcupdate and mergemaster from deleting it for now.
  
  Approved by:	re (rgrimes), will (mentor)
  Differential Revision:	https://reviews.freebsd.org/D16975

Modified:
  head/usr.sbin/periodic/Makefile

Modified: head/usr.sbin/periodic/Makefile
==============================================================================
--- head/usr.sbin/periodic/Makefile	Sun Sep  2 15:42:37 2018	(r338428)
+++ head/usr.sbin/periodic/Makefile	Sun Sep  2 15:53:56 2018	(r338429)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-FILES=	periodic.conf
-FILESDIR=	/etc/defaults
+CONFS=	periodic.conf
+CONFSDIR=	/etc/defaults
 SCRIPTS=periodic.sh
 MAN=	periodic.8