conf/186971: [PATCH] install /etc/devd/zfs.conf if WITH_ZFS is set

[Garrett Cooper]

>Number:         186971
>Category:       conf
>Synopsis:       [PATCH] install /etc/devd/zfs.conf if WITH_ZFS is set
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 23 04:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Garrett Cooper
>Release:        11-CURRENT
>Organization:
>Environment:
FreeBSD fuji-current.local 11.0-CURRENT FreeBSD 11.0-CURRENT #1 r261958+40e3169(master): Sat Feb 15 08:18:02 PST 2014     root at fuji-current.local:/usr/obj/usr/src/sys/FUJI-NOCOMPAT  i386
>Description:
r261894 moved all of the ZFS devd rules out of devd.conf into zfs.conf.

The attached patch enhances r261894 by only installing zfs.conf if WITH_ZFS is specified.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

>From e6bc9c6903a43989fa95ea8e00adc72e836a4d32 Mon Sep 17 00:00:00 2001
From: Garrett Cooper <yanegomi at gmail.com>
Date: Sat, 22 Feb 2014 02:57:09 -0800
Subject: [PATCH] Make etc/devd/zfs.conf optional

---
 etc/devd/Makefile                        | 8 +++++++-
 tools/build/mk/OptionalObsoleteFiles.inc | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/etc/devd/Makefile b/etc/devd/Makefile
index c744398..1ca0854 100644
--- a/etc/devd/Makefile
+++ b/etc/devd/Makefile
@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-FILES=	uath.conf usb.conf zfs.conf
+.include <bsd.own.mk>
+
+FILES=	uath.conf usb.conf
 
 .if ${MACHINE} == "powerpc"
 FILES+=	apple.conf
@@ -10,6 +12,10 @@ FILES+=	apple.conf
 FILES+=	asus.conf
 .endif
 
+.if ${MK_ZFS} == "yes"
+FILES+= zfs.conf
+.endif
+
 NO_OBJ=
 FILESDIR=	/etc/devd
 FILESMODE=	644
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 703d1a9..85eb92b 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -485,6 +485,7 @@ OLD_FILES+=usr/share/man/man1/dtrace.1.gz
 OLD_FILES+=boot/gptzfsboot
 OLD_FILES+=boot/zfsboot
 OLD_FILES+=boot/zfsloader
+OLD_FILES+=etc/devd/zfs.conf
 OLD_FILES+=etc/periodic/daily/404.status-zfs
 OLD_FILES+=etc/periodic/daily/800.scrub-zfs
 OLD_LIBS+=lib/libzfs.so.2
-- 
1.8.5.2



>Release-Note:
>Audit-Trail:
>Unformatted: