svn commit: r299841 - head/tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Sun May 15 05:22:15 2016
New Revision: 299841
URL: https://svnweb.freebsd.org/changeset/base/299841

Log:
  Remove etc/rc.d/{zfs,zvol} if MK_ZFS != no
  
  MFC after: 2 weeks
  X-MFC with: r299840
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Sun May 15 04:39:36 2016	(r299840)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Sun May 15 05:22:15 2016	(r299841)
@@ -1010,6 +1010,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