Attachment 140409 Details for Bug 186971 – file.txt

file.txt

file.txt (text/plain), 1.31 KB, created by Enji Cooper on 2014-02-23 04:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Enji Cooper

Created: 2014-02-23 04:20:00 UTC

Size: 1.31 KB

patch

obsolete

>From e6bc9c6903a43989fa95ea8e00adc72e836a4d32 Mon Sep 17 00:00:00 2001
>From: Garrett Cooper <yanegomi@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

Actions: View

Attachments on bug 186971: 140409