diff options
| author | ngie <ngie@FreeBSD.org> | 2016-06-08 13:32:00 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2016-06-08 13:32:00 +0000 |
| commit | a84f9fbf4f659d55aebd43589610c38f2670dfb3 (patch) | |
| tree | 7868d350e18c3edeee36d3a7931345ab82a36bd4 /tools | |
| parent | 511b4b072bad0ff4a6d17bd51fb3664d07662da8 (diff) | |
| download | FreeBSD-src-a84f9fbf4f659d55aebd43589610c38f2670dfb3.zip FreeBSD-src-a84f9fbf4f659d55aebd43589610c38f2670dfb3.tar.gz | |
MFC r299839,r299840,r299841:
r299839:
Make FILESYSTEMS, dumpon, and var not depend on zfs and zvol
Make zfs and zvol come before all of the items that depended on them
previously
r299840:
Conditionalize etc/rc.d/{zfs,zvol} install on MK_ZFS != no
r299841:
Remove etc/rc.d/{zfs,zvol} if MK_ZFS != no
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index b29dc15..cf70b87 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -650,6 +650,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 |
