From owner-svn-src-user@freebsd.org  Sun Oct 25 08:30:45 2015
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 699BF8D5A
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Sun, 25 Oct 2015 08:30:45 +0000 (UTC)
 (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 2E3C21CE1;
 Sun, 25 Oct 2015 08:30:45 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9P8Uinn069740;
 Sun, 25 Oct 2015 08:30:44 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9P8UiOg069739;
 Sun, 25 Oct 2015 08:30:44 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201510250830.t9P8UiOg069739@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sun, 25 Oct 2015 08:30:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r289926 - user/ngie/detangle-rc/tools/build/mk
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Oct 2015 08:30:45 -0000

Author: ngie
Date: Sun Oct 25 08:30:44 2015
New Revision: 289926
URL: https://svnweb.freebsd.org/changeset/base/289926

Log:
  Remove rc.d scripts conditionally after adding the conditional
  install logic in r289923

Modified:
  user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc

Modified: user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc	Sun Oct 25 07:42:56 2015	(r289925)
+++ user/ngie/detangle-rc/tools/build/mk/OptionalObsoleteFiles.inc	Sun Oct 25 08:30:44 2015	(r289926)
@@ -999,6 +999,8 @@ OLD_DIRS+=usr/share/dtrace
 OLD_FILES+=boot/gptzfsboot
 OLD_FILES+=boot/zfsboot
 OLD_FILES+=boot/zfsloader
+OLD_FILES+=etc/rc.d/zfs
+OLD_FILES+=etc/rc.d/zvol
 OLD_FILES+=etc/devd/zfs.conf
 OLD_FILES+=etc/periodic/daily/404.status-zfs
 OLD_FILES+=etc/periodic/daily/800.scrub-zfs
@@ -2782,6 +2784,8 @@ OLD_FILES+=usr/share/man/man3/iconvlist.
 .endif
 
 .if ${MK_INET6} == no
+OLD_FILES+=etc/rc.d/mroute6d
+OLD_FILES+=etc/rc.d/route6d
 OLD_FILES+=sbin/ping6
 OLD_FILES+=sbin/rtsol
 OLD_FILES+=usr/sbin/ip6addrctl