From owner-svn-src-head@freebsd.org  Sat Jul 28 23:02:11 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 70A801061207;
 Sat, 28 Jul 2018 23:02: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 26CE684C58;
 Sat, 28 Jul 2018 23:02: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 07D0A5783;
 Sat, 28 Jul 2018 23:02: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 w6SN2Aak013812;
 Sat, 28 Jul 2018 23:02:10 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6SN2AJV013811;
 Sat, 28 Jul 2018 23:02:10 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201807282302.w6SN2AJV013811@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: Sat, 28 Jul 2018 23:02:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r336849 - head/sbin/init
X-SVN-Group: head
X-SVN-Commit-Author: brd
X-SVN-Commit-Paths: head/sbin/init
X-SVN-Commit-Revision: 336849
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: Sat, 28 Jul 2018 23:02:11 -0000

Author: brd
Date: Sat Jul 28 23:02:10 2018
New Revision: 336849
URL: https://svnweb.freebsd.org/changeset/base/336849

Log:
  Switch these to CONFS as well so they work with etcupdate/mergemaster.
  
  Approved by:	will (mentor)

Modified:
  head/sbin/init/Makefile

Modified: head/sbin/init/Makefile
==============================================================================
--- head/sbin/init/Makefile	Sat Jul 28 20:45:36 2018	(r336848)
+++ head/sbin/init/Makefile	Sat Jul 28 23:02:10 2018	(r336849)
@@ -1,15 +1,15 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 # $FreeBSD$
 
-FILESGROUPS=	FILESETC FILESETCEXEC FILESETCDEFAULTS
-FILESETCDIR=	/etc
-FILESETC=	network.subr rc rc.initdiskless rc.subr rc.shutdown
-FILESETCMODE=	644
-FILESETCEXEC=	netstart pccard_ether rc.resume rc.suspend
-FILESETCEXECDIR=	/etc
-FILESETCEXECMODE=	755
-FILESETCDEFAULTSDIR=	/etc/defaults
-FILESETCDEFAULTS=	rc.conf
+CONFGROUPS=	CONFETC CONFETCEXEC CONFETCDEFAULTS
+CONFETCDIR=	/etc
+CONFETC=	network.subr rc rc.initdiskless rc.subr rc.shutdown
+CONFETCMODE=	644
+CONFETCEXEC=	netstart pccard_ether rc.resume rc.suspend
+CONFETCEXECDIR=	/etc
+CONFETCEXECMODE=	755
+CONFETCDEFAULTSDIR=	/etc/defaults
+CONFETCDEFAULTS=	rc.conf
 PACKAGE=runtime
 PROG=	init
 SRCS=	init.c getmntopts.c