summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>2014-11-05 17:07:59 +0000
committermillert <millert@openbsd.org>2014-11-05 17:07:59 +0000
commitca51295a0ea8b2d2d0fa68cce06019146eab6fb2 (patch)
tree8b982ae30028fb77a2205bdbb0822eefe8f7669f
parentImplement yet another workaround for the k1 em(4)'s. This time for (diff)
downloadwireguard-openbsd-ca51295a0ea8b2d2d0fa68cce06019146eab6fb2.tar.xz
wireguard-openbsd-ca51295a0ea8b2d2d0fa68cce06019146eab6fb2.zip
When clearing /tmp, use "-maxdepth -1" instead of "-type d -prune".
This is easier to understand and fixes a bug where the "-type d -prune" was misplaced as noticed by pirofti@. OK deraadt@
-rw-r--r--etc/rc6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/rc b/etc/rc
index ac70196d3b6..aa6aa039a4d 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.442 2014/09/15 22:28:58 matthieu Exp $
+# $OpenBSD: rc,v 1.443 2014/11/05 17:07:59 millert Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -442,8 +442,8 @@ echo clearing /tmp
# (not needed with mfs /tmp, but doesn't hurt there...)
(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)
+ find . -maxdepth 1 ! -name . ! -name lost+found ! -name quota.user \
+ ! -name quota.group -execdir rm -rf -- {} \;)
setup_X_sockets