svn commit: r300335 - in projects/zfsd/head: cddl/sbin cddl/sbin/zfsd cddl/usr.sbin cddl/usr.sbin/zfsd etc/mtree etc/rc.d tests/sys/cddl/zfs/include

[Alan Somers]

Author: asomers
Date: Fri May 20 22:03:51 2016
New Revision: 300335
URL: https://svnweb.freebsd.org/changeset/base/300335

Log:
  Move zfsd from /sbin to /usr/sbin.  It isn't needed at boot.
  
  Sponsored by:	Spectra Logic Corp

Added:
  projects/zfsd/head/cddl/usr.sbin/zfsd/
     - copied from r300334, projects/zfsd/head/cddl/sbin/zfsd/
Deleted:
  projects/zfsd/head/cddl/sbin/zfsd/
Modified:
  projects/zfsd/head/cddl/sbin/Makefile
  projects/zfsd/head/cddl/usr.sbin/Makefile
  projects/zfsd/head/etc/mtree/BSD.tests.dist
  projects/zfsd/head/etc/rc.d/zfsd
  projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt

Modified: projects/zfsd/head/cddl/sbin/Makefile
==============================================================================
--- projects/zfsd/head/cddl/sbin/Makefile	Fri May 20 20:27:30 2016	(r300334)
+++ projects/zfsd/head/cddl/sbin/Makefile	Fri May 20 22:03:51 2016	(r300335)
@@ -2,7 +2,7 @@
 
 .include <src.opts.mk>
 
-SUBDIR=	${_tests} ${_zfs} ${_zfsd} ${_zpool}
+SUBDIR=	${_tests} ${_zfs} ${_zpool}
 
 .if ${MK_TESTS} != "no"
 _tests=	tests
@@ -11,9 +11,6 @@ _tests=	tests
 .if ${MK_ZFS} != "no"
 _zfs=	zfs
 _zpool=	zpool
-. if ${MK_CXX} != "no"
-_zfsd=	zfsd
-. endif
 .endif
 
 SUBDIR_PARALLEL=

Modified: projects/zfsd/head/cddl/usr.sbin/Makefile
==============================================================================
--- projects/zfsd/head/cddl/usr.sbin/Makefile	Fri May 20 20:27:30 2016	(r300334)
+++ projects/zfsd/head/cddl/usr.sbin/Makefile	Fri May 20 22:03:51 2016	(r300335)
@@ -7,6 +7,7 @@ SUBDIR=	${_dtrace} \
 	${_plockstat} \
 	${_tests} \
 	${_zdb} \
+	${_zfsd} \
 	${_zhack}
 
 .if ${MK_TESTS} != "no"
@@ -18,6 +19,9 @@ _tests=	tests
 _zdb=	zdb
 _zhack=	zhack
 .endif
+. if ${MK_CXX} != "no"
+_zfsd=	zfsd
+. endif
 .endif
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"

Modified: projects/zfsd/head/etc/mtree/BSD.tests.dist
==============================================================================
--- projects/zfsd/head/etc/mtree/BSD.tests.dist	Fri May 20 20:27:30 2016	(r300334)
+++ projects/zfsd/head/etc/mtree/BSD.tests.dist	Fri May 20 22:03:51 2016	(r300335)
@@ -48,10 +48,6 @@
     cddl
         lib
         ..
-        sbin
-            zfsd
-            ..
-        ..
         usr.bin
         ..
         usr.sbin
@@ -217,6 +213,8 @@
                     ..
                 ..
             ..
+            zfsd
+            ..
         ..
     ..
     etc

Modified: projects/zfsd/head/etc/rc.d/zfsd
==============================================================================
--- projects/zfsd/head/etc/rc.d/zfsd	Fri May 20 20:27:30 2016	(r300334)
+++ projects/zfsd/head/etc/rc.d/zfsd	Fri May 20 22:03:51 2016	(r300335)
@@ -11,7 +11,7 @@
 
 name="zfsd"
 rcvar="zfsd_enable"
-command="/sbin/${name}"
+command="/usr/sbin/${name}"
 
 load_rc_config $name
 run_rc_command "$1"

Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt	Fri May 20 20:27:30 2016	(r300334)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt	Fri May 20 22:03:51 2016	(r300335)
@@ -176,7 +176,7 @@
 /sbin/swapoff
 /sbin/swapctl
 /usr/bin/xargs
-/sbin/zfsd
+/usr/sbin/zfsd
  
 # ZFS Commands
 /usr/sbin/zdb