svn commit: r301612 - in stable/10: etc/rc.d tools/build/mk
Garrett Cooper
ngie at FreeBSD.org
Wed Jun 8 13:32:03 UTC 2016
Author: ngie
Date: Wed Jun 8 13:32:00 2016
New Revision: 301612
URL: https://svnweb.freebsd.org/changeset/base/301612
Log:
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
Modified:
stable/10/etc/rc.d/FILESYSTEMS
stable/10/etc/rc.d/Makefile
stable/10/etc/rc.d/dumpon
stable/10/etc/rc.d/var
stable/10/etc/rc.d/zfs
stable/10/etc/rc.d/zvol
stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/rc.d/FILESYSTEMS
==============================================================================
--- stable/10/etc/rc.d/FILESYSTEMS Wed Jun 8 13:25:15 2016 (r301611)
+++ stable/10/etc/rc.d/FILESYSTEMS Wed Jun 8 13:32:00 2016 (r301612)
@@ -4,7 +4,7 @@
#
# PROVIDE: FILESYSTEMS
-# REQUIRE: root mountcritlocal cleanvar zfs
+# REQUIRE: root mountcritlocal cleanvar
# This is a dummy dependency, for services which require file systems
# to be mounted before starting. It also serves as the default early /
Modified: stable/10/etc/rc.d/Makefile
==============================================================================
--- stable/10/etc/rc.d/Makefile Wed Jun 8 13:25:15 2016 (r301611)
+++ stable/10/etc/rc.d/Makefile Wed Jun 8 13:32:00 2016 (r301612)
@@ -134,8 +134,6 @@ FILES= DAEMON \
ypset \
ypupdated \
ypxfrd \
- zfs \
- zvol
.if ${MK_ACCT} != "no"
FILES+= accounting
@@ -283,6 +281,11 @@ FILES+= hostapd
FILES+= wpa_supplicant
.endif
+.if ${MK_ZFS} != "no"
+FILES+= zfs
+FILES+= zvol
+.endif
+
FILESDIR= /etc/rc.d
FILESMODE= ${BINMODE}
Modified: stable/10/etc/rc.d/dumpon
==============================================================================
--- stable/10/etc/rc.d/dumpon Wed Jun 8 13:25:15 2016 (r301611)
+++ stable/10/etc/rc.d/dumpon Wed Jun 8 13:32:00 2016 (r301612)
@@ -4,7 +4,6 @@
#
# PROVIDE: dumpon
-# REQUIRE: zvol
# BEFORE: disks
# KEYWORD: nojail
Modified: stable/10/etc/rc.d/var
==============================================================================
--- stable/10/etc/rc.d/var Wed Jun 8 13:25:15 2016 (r301611)
+++ stable/10/etc/rc.d/var Wed Jun 8 13:32:00 2016 (r301612)
@@ -28,7 +28,7 @@
#
# PROVIDE: var
-# REQUIRE: mountcritlocal zfs
+# REQUIRE: mountcritlocal
# NFS /var is not supported, unless NFS /var is part of diskless NFS /
Modified: stable/10/etc/rc.d/zfs
==============================================================================
--- stable/10/etc/rc.d/zfs Wed Jun 8 13:25:15 2016 (r301611)
+++ stable/10/etc/rc.d/zfs Wed Jun 8 13:32:00 2016 (r301612)
@@ -5,6 +5,7 @@
# PROVIDE: zfs
# REQUIRE: mountcritlocal
+# BEFORE: FILESYSTEMS var
. /etc/rc.subr
Modified: stable/10/etc/rc.d/zvol
==============================================================================
--- stable/10/etc/rc.d/zvol Wed Jun 8 13:25:15 2016 (r301611)
+++ stable/10/etc/rc.d/zvol Wed Jun 8 13:32:00 2016 (r301612)
@@ -5,6 +5,7 @@
# PROVIDE: zvol
# REQUIRE: hostid
+# BEFORE: dumpon
# KEYWORD: nojail
. /etc/rc.subr
Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Jun 8 13:25:15 2016 (r301611)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Jun 8 13:32:00 2016 (r301612)
@@ -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
More information about the svn-src-stable-10
mailing list