diff options
| -rw-r--r-- | etc/Makefile | 3 | ||||
| -rw-r--r-- | etc/daily | 15 | ||||
| -rw-r--r-- | etc/mtree/4.4BSD.dist | 8 | ||||
| -rw-r--r-- | etc/rc | 8 | ||||
| -rw-r--r-- | share/man/man7/hier.7 | 14 |
5 files changed, 19 insertions, 29 deletions
diff --git a/etc/Makefile b/etc/Makefile index d2c00030aa4..11e58c09fbf 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.398 2014/10/03 19:22:38 deraadt Exp $ +# $OpenBSD: Makefile,v 1.399 2014/11/17 18:19:08 deraadt Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -210,6 +210,7 @@ distribution-etc-root-var: distrib-dirs ${DESTDIR}/etc/rc.d && \ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 ${RCDAEMONS} \ ${DESTDIR}/etc/rc.d + cd ${DESTDIR}/var; ln -fs ../tmp touch ${DESTDIR}/usr/share/sysmerge/etcsum touch ${DESTDIR}/usr/share/sysmerge/examplessum cd ${DESTDIR}/ && \ 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; } diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist index 03b58656cf7..f529df7e0b0 100644 --- a/etc/mtree/4.4BSD.dist +++ b/etc/mtree/4.4BSD.dist @@ -1,4 +1,4 @@ -# $OpenBSD: 4.4BSD.dist,v 1.267 2014/10/09 04:24:30 tedu Exp $ +# $OpenBSD: 4.4BSD.dist,v 1.268 2014/11/17 18:19:08 deraadt Exp $ /set type=dir uname=root gname=wheel mode=0755 @@ -779,12 +779,6 @@ var .. .. - # ./var/tmp - tmp mode=01777 - vi.recover mode=01777 - .. - .. - # ./var/unbound unbound etc uname=root gname=wheel mode=0755 @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.443 2014/11/05 17:07:59 millert Exp $ +# $OpenBSD: rc,v 1.444 2014/11/17 18:19:08 deraadt Exp $ # System startup script run by init on autoboot # or after single-user. @@ -438,12 +438,12 @@ fi echo clearing /tmp -# prune quickly with one rm, then use find to clean up /tmp/[lq]* +# prune quickly with one rm, then use find to clean up /tmp/[lqv]* # (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-uw-zA-Z]*) (cd /tmp && find . -maxdepth 1 ! -name . ! -name lost+found ! -name quota.user \ - ! -name quota.group -execdir rm -rf -- {} \;) + ! -name quota.group ! -name vi.recover -execdir rm -rf -- {} \;) setup_X_sockets diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index d1fa61d11f0..2707841c0c9 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: hier.7,v 1.136 2014/10/09 04:22:20 tedu Exp $ +.\" $OpenBSD: hier.7,v 1.137 2014/11/17 18:19:08 deraadt Exp $ .\" $NetBSD: hier.7,v 1.7 1994/11/30 19:07:10 jtc Exp $ .\" .\" Copyright (c) 1990, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 .\" -.Dd $Mdocdate: October 9 2014 $ +.Dd $Mdocdate: November 17 2014 $ .Dt HIER 7 .Os .Sh NAME @@ -603,8 +603,14 @@ uucp spool directory. Commonly ~uucp; public uucp temporary directory. .El .Pp -.It tmp/ -Temporary files that are kept between system reboots. +.It tmp -> ../tmp +A symbolic link to the system +.Pa /tmp +directory. +To protect other users of +.Pa /var +from overfill conditions, this is no longer a space you can trust to +retain storage over a reboot. Periodically cleaned by .Xr daily 8 . .It unbound/ |