From: sthen <sthen@openbsd.org>
Date: Tue, 13 Jul 2010 12:28:13 +0000 (+0000)
Subject: When cleaning /tmp at boot, run the slower find unconditionally.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=68b9454cdf6559de564911e16e7d6df947aa6963;p=openbsd

When cleaning /tmp at boot, run the slower find unconditionally.
Previously if the quick rm -rf failed, find was not run, so some files
were not removed. Looks good to tedu@.
---

diff --git a/etc/rc b/etc/rc
index 91ab7c81e9d..09c5d70108f 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.338 2010/06/28 20:16:21 reyk Exp $
+#	$OpenBSD: rc,v 1.339 2010/07/13 12:28:13 sthen Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -534,7 +534,8 @@ echo clearing /tmp
 
 # prune quickly with one rm, then use find to clean up /tmp/[lq]*
 # (not needed with mfs /tmp, but doesn't hurt there...)
-(cd /tmp && rm -rf [a-km-pr-zA-Z]* &&
+(cd /tmp && rm -rf [a-km-pr-zA-Z]*)
+(cd /tmp &&
     find . ! -name . ! -name lost+found ! -name quota.user \
 	! -name quota.group -execdir rm -rf -- {} \; -type d -prune)