summaryrefslogtreecommitdiff
path: root/etc/daily
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2014-11-17 18:19:09 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2014-11-17 18:19:09 +0000
commitb733660542037b74a5bf6855bd86874defb95261 (patch)
tree62f509c761d9464f04b904ee708c874285350c51 /etc/daily
parentf99447f2619028166c07e63b019fdcadb75386a8 (diff)
Make /var/tmp a symbolic link to /tmp. The creation of /var/tmp in the
often space-constrained /var filesystem was a historical mistake. There are big implications for the daemons which assume they won't run out of space, and this is a first step towards trying to improve the situation. Move /tmp to the same 7-day expiration rules that /var/tmp had. vi.recover works just as well as before, except on memory filesystems; indicating that vi should be repaired to write files into homedirs or something. done with rpe ok many
Diffstat (limited to 'etc/daily')
-rw-r--r--etc/daily15
1 files changed, 2 insertions, 13 deletions
diff --git a/etc/daily b/etc/daily
index b22ad6bc129..3d913bb58ad 100644
--- a/etc/daily
+++ b/etc/daily
@@ -1,5 +1,5 @@
#
-# $OpenBSD: daily,v 1.81 2014/07/02 13:39:41 sthen Exp $
+# $OpenBSD: daily,v 1.82 2014/11/17 18:19:08 deraadt Exp $
# From: @(#)daily 8.2 (Berkeley) 1/25/94
#
# For local additions, create the file /etc/daily.local.
@@ -50,18 +50,7 @@ if [ -d /tmp -a ! -L /tmp ]; then
find -x . \
\( -path './ssh-*' -o -path ./.X11-unix -o -path ./.ICE-unix \
-o -path ./portslocks -o -path './tmux-*' \) \
- -prune -o -type f -atime +3 -execdir rm -f -- {} \; 2>/dev/null
- find -x . -type d -mtime +1 ! -path ./vi.recover ! -path ./.X11-unix \
- ! -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 \
- -o -path ./portslocks -o -path './tmux-*' \) \
- -prune -o ! -type d -atime +7 -execdir rm -f -- {} \; 2>/dev/null
+ -prune -o -type f -atime +7 -execdir rm -f -- {} \; 2>/dev/null
find -x . -type d -mtime +1 ! -path ./vi.recover ! -path ./.X11-unix \
! -path ./.ICE-unix ! -path ./portslocks ! -name . \
-execdir rmdir -- {} \; >/dev/null 2>&1; }