svn commit: r299840 - head/etc/rc.d

Garrett Cooper ngie at FreeBSD.org
Sun May 15 04:39:37 UTC 2016


Author: ngie
Date: Sun May 15 04:39:36 2016
New Revision: 299840
URL: https://svnweb.freebsd.org/changeset/base/299840

Log:
  Conditionalize etc/rc.d/{zfs,zvol} install on MK_ZFS != no
  
  MFC after: 2 weeks
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/rc.d/Makefile

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Sun May 15 04:38:50 2016	(r299839)
+++ head/etc/rc.d/Makefile	Sun May 15 04:39:36 2016	(r299840)
@@ -127,8 +127,6 @@ FILES=	DAEMON \
 	ypset \
 	ypupdated \
 	ypxfrd \
-	zfs \
-	zvol
 
 .if ${MK_ACCT} != "no"
 FILESGROUPS+=	ACCT
@@ -302,6 +300,13 @@ FILES+=		hostapd
 FILES+=		wpa_supplicant
 .endif
 
+.if ${MK_ZFS} != "no"
+FILESGROUPS+=	ZFS
+ZFS+=		zfs
+ZFS+=		zvol
+ZFSPACKAGE=	zfs
+.endif
+
 .for fg in ${FILESGROUPS}
 ${fg}MODE?=	${BINMODE}
 .endfor


More information about the svn-src-head mailing list