summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2005-12-27 23:22:18 +0000
committerdougb <dougb@FreeBSD.org>2005-12-27 23:22:18 +0000
commit5e136009538a36ec42653740d9d983fac13a97ac (patch)
treec55c4f831ed2a4903ba36e5ad76e88ce7c9524d1 /etc
parent761b74bc75712cd836af1b315c32a825e0a0d329 (diff)
downloadFreeBSD-src-5e136009538a36ec42653740d9d983fac13a97ac.zip
FreeBSD-src-5e136009538a36ec42653740d9d983fac13a97ac.tar.gz
Fix another braino, don't remove the X related socket directories
right after creating them. Twiddle whitespace while I'm here.
Diffstat (limited to 'etc')
-rwxr-xr-xetc/rc.d/cleartmp7
1 files changed, 5 insertions, 2 deletions
diff --git a/etc/rc.d/cleartmp b/etc/rc.d/cleartmp
index 676ce95..86a7c7e 100755
--- a/etc/rc.d/cleartmp
+++ b/etc/rc.d/cleartmp
@@ -18,7 +18,8 @@ cleartmp_prestart()
{
checkyesno clear_tmp_X || return
- local x11_socket_dirs="/tmp/.X11-unix /tmp/.ICE-unix /tmp/.font-unix /tmp/.XIM-unix"
+ local x11_socket_dirs="/tmp/.X11-unix /tmp/.ICE-unix /tmp/.font-unix \
+ /tmp/.XIM-unix"
# Remove X lock files, since they will prevent you from restarting X.
rm -f /tmp/.X[0-9]-lock
@@ -40,7 +41,9 @@ cleartmp_start()
#
(cd /tmp && rm -rf [a-km-pr-zA-Z]* &&
find -x . ! -name . ! -name lost+found ! -name quota.user \
- ! -name quota.group -exec rm -rf -- {} \; -type d -prune)
+ ! -name quota.group ! -name .X11-unix ! -name .ICE-unix \
+ ! -name .font-unix ! -name .XIM-unix \
+ -exec rm -rf -- {} \; -type d -prune)
}
load_rc_config $name
OpenPOWER on IntegriCloud