From owner-svn-src-projects@freebsd.org  Tue May 24 19:26:59 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C23BDB480C5
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue, 24 May 2016 19:26:59 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7AADD1038;
 Tue, 24 May 2016 19:26:59 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4OJQwsg003048;
 Tue, 24 May 2016 19:26:58 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4OJQwwd003044;
 Tue, 24 May 2016 19:26:58 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201605241926.u4OJQwwd003044@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 24 May 2016 19:26:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r300623 - in projects/zfsd/head: cddl/usr.sbin/zfsd
 etc/mtree
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 May 2016 19:26:59 -0000

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
     ..