summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2010-07-25 08:49:04 +0000
committerMarc Espie <espie@cvs.openbsd.org>2010-07-25 08:49:04 +0000
commit0a3cf252e8cd9b325e683e7bc6fb2432ea21d880 (patch)
tree1bb0719989038a278db6e0c99aac98580c9bf73a /etc
parent10323a004f163888b7c3e83f9c9602b80c190790 (diff)
handle portslock. reminded by antoine@
Diffstat (limited to 'etc')
-rw-r--r--etc/daily14
1 files changed, 9 insertions, 5 deletions
diff --git a/etc/daily b/etc/daily
index 0a062cba4e0..8504b154555 100644
--- a/etc/daily
+++ b/etc/daily
@@ -1,5 +1,5 @@
#
-# $OpenBSD: daily,v 1.66 2009/05/26 22:59:15 schwarze Exp $
+# $OpenBSD: daily,v 1.67 2010/07/25 08:49:03 espie Exp $
# From: @(#)daily 8.2 (Berkeley) 1/25/94
#
# For local additions, create the file /etc/daily.local.
@@ -48,19 +48,23 @@ next_part "Removing scratch and junk files:"
if [ -d /tmp -a ! -L /tmp ]; then
cd /tmp && {
find -x . \
- \( -path './ssh-*' -o -path ./.X11-unix -o -path ./.ICE-unix \) \
+ \( -path './ssh-*' -o -path ./.X11-unix -o -path ./.ICE-unix \
+ -o -path ./portslocks \) \
-prune -o -type f -atime +3 -execdir rm -f -- {} \;
find -x . -type d -mtime +1 ! -path ./vi.recover ! -path ./.X11-unix \
- ! -path ./.ICE-unix ! -name . -execdir rmdir -- {} \; >/dev/null 2>&1; }
+ ! -path ./.ICE-unix ! -path ./portslocks ! -name . \
+ -execdir rmdir -- {} \; >/dev/null 2>&1; }
fi
if [ -d /var/tmp -a ! -L /var/tmp ]; then
cd /var/tmp && {
find -x . \
- \( -path './ssh-*' -o -path ./.X11-unix -o -path ./.ICE-unix \) \
+ \( -path './ssh-*' -o -path ./.X11-unix -o -path ./.ICE-unix \
+ -o -path ./portslocks \) \
-prune -o ! -type d -atime +7 -execdir rm -f -- {} \;
find -x . -type d -mtime +1 ! -path ./vi.recover ! -path ./.X11-unix \
- ! -path ./.ICE-unix ! -name . -execdir rmdir -- {} \; >/dev/null 2>&1; }
+ ! -path ./.ICE-unix ! -path ./portslocks ! -name . \
+ -execdir rmdir -- {} \; >/dev/null 2>&1; }
fi
# Additional junk directory cleanup would go like this: