diff options
| author | ngie <ngie@FreeBSD.org> | 2014-08-15 21:35:31 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2014-08-15 21:35:31 +0000 |
| commit | 82e14020fd65682e9c4e04af88589597b3609efa (patch) | |
| tree | 045efd481f4e10d494a50a4099543b06ab5f47ac /tools | |
| parent | e4261b2c3a9a2282564c39c807ddc0250d6c15eb (diff) | |
| download | FreeBSD-src-82e14020fd65682e9c4e04af88589597b3609efa.zip FreeBSD-src-82e14020fd65682e9c4e04af88589597b3609efa.tar.gz | |
Make the USB and ZFS devd configuration files optional depending on the
values of MK_USB/MK_ZFS
Making zfs.conf optional resolves PR # 186971
PR: 186971
Phabric: D606
Approved by: jmmv (mentor)
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index d3cf72f..78878c2 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -444,6 +444,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 @@ -4677,9 +4678,10 @@ OLD_FILES+=usr/sbin/unbound-control OLD_FILES+=usr/sbin/unbound-control-setup .endif -#.if ${MK_USB} == no -# to be filled in -#.endif +.if ${MK_USB} == no +OLD_FILES+=etc/devd/uauth.conf +OLD_FILES+=etc/devd/usb.conf +.endif .if ${MK_UTMPX} == no OLD_FILES+=etc/periodic/monthly/200.accounting |
