From owner-svn-src-head@FreeBSD.ORG  Sun Sep  5 05:44:41 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 490D010656AB;
	Sun,  5 Sep 2010 05:44:41 +0000 (UTC)
	(envelope-from daichi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 384228FC08;
	Sun,  5 Sep 2010 05:44:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o855ifCU057732;
	Sun, 5 Sep 2010 05:44:41 GMT (envelope-from daichi@svn.freebsd.org)
Received: (from daichi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o855ifCL057730;
	Sun, 5 Sep 2010 05:44:41 GMT (envelope-from daichi@svn.freebsd.org)
Message-Id: <201009050544.o855ifCL057730@svn.freebsd.org>
From: Daichi GOTO <daichi@FreeBSD.org>
Date: Sun, 5 Sep 2010 05:44:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212222 - head/etc/rc.d
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Sep 2010 05:44:41 -0000

Author: daichi
Date: Sun Sep  5 05:44:40 2010
New Revision: 212222
URL: http://svn.freebsd.org/changeset/base/212222

Log:
  Avoid to try to remove suj journal file (.sujournal) and conventional
  snapshot directory (.snap) from cleartmp rc.d script.

Modified:
  head/etc/rc.d/cleartmp

Modified: head/etc/rc.d/cleartmp
==============================================================================
--- head/etc/rc.d/cleartmp	Sun Sep  5 04:58:16 2010	(r212221)
+++ head/etc/rc.d/cleartmp	Sun Sep  5 05:44:40 2010	(r212222)
@@ -36,7 +36,10 @@ cleartmp_start()
 		#   it can prevent foot-shooting in future.
 		# + /tmp/lost+found is preserved, but its contents are removed.
 		# + lost+found and quota.* in subdirectories are removed.
+		# + .sujournal and .snap are preserved.
 		find -x ${tmp}/. ! -name . \
+		    ! \( -name .sujournal -type f -user root \) \
+		    ! \( -name .snap -type d -user root \) \
 		    ! \( -name lost+found -type d -user root \) \
 		    ! \( \( -name quota.user -or -name quota.group \) \
 			-type f -user root \) \