svn commit: r300623 - in projects/zfsd/head: cddl/usr.sbin/zfsd etc/mtree

[Alan Somers]

Author: asomers
Date: Tue May 24 19:26:58 2016
New Revision: 300623
URL: https://svnweb.freebsd.org/changeset/base/300623

Log:
  Move zfsd's case files to /var/db/zfsd/cases
  
  It was never really appropriate to store these thing in /etc
  
  cddl/usr.sbin/zfsd/case_file.cc
  	Change the case file location
  
  etc/mtree/BSD.root.dist
  	Don't create /etc/zfs/cases
  
  etc/mtree/BSD.var.dist
  	Do create /var/db/zfsd/cases
  
  Sponsored by:	Spectra Logic Corp

Modified:
  projects/zfsd/head/cddl/usr.sbin/zfsd/case_file.cc
  projects/zfsd/head/etc/mtree/BSD.root.dist
  projects/zfsd/head/etc/mtree/BSD.var.dist

Modified: projects/zfsd/head/cddl/usr.sbin/zfsd/case_file.cc
==============================================================================
--- projects/zfsd/head/cddl/usr.sbin/zfsd/case_file.cc	Tue May 24 19:20:30 2016	(r300622)
+++ projects/zfsd/head/cddl/usr.sbin/zfsd/case_file.cc	Tue May 24 19:26:58 2016	(r300623)
@@ -91,8 +91,9 @@ using DevdCtl::ParseException;
 
 /*--------------------------------- CaseFile ---------------------------------*/
 //- CaseFile Static Data -------------------------------------------------------
+
 CaseFileList  CaseFile::s_activeCases;
-const string  CaseFile::s_caseFilePath = "/etc/zfs/cases";
+const string  CaseFile::s_caseFilePath = "/var/db/zfsd/cases";
 const timeval CaseFile::s_removeGracePeriod = { 60 /*sec*/, 0 /*usec*/};
 
 //- CaseFile Static Public Methods ---------------------------------------------

Modified: projects/zfsd/head/etc/mtree/BSD.root.dist
==============================================================================
--- projects/zfsd/head/etc/mtree/BSD.root.dist	Tue May 24 19:20:30 2016	(r300622)
+++ projects/zfsd/head/etc/mtree/BSD.root.dist	Tue May 24 19:26:58 2016	(r300623)
@@ -76,10 +76,6 @@
         ..
         ssl
         ..
-        zfs
-            cases
-            ..
-        ..
     ..
     lib
         casper

Modified: projects/zfsd/head/etc/mtree/BSD.var.dist
==============================================================================
--- projects/zfsd/head/etc/mtree/BSD.var.dist	Tue May 24 19:20:30 2016	(r300622)
+++ projects/zfsd/head/etc/mtree/BSD.var.dist	Tue May 24 19:26:58 2016	(r300623)
@@ -54,6 +54,10 @@
         ..
         portsnap
         ..
+        zfsd
+            cases
+            ..
+        ..
     ..
     empty           mode=0555 flags=schg
     ..