From c4818267a4f8eaa33946aad734a1eb9690fb2178 Mon Sep 17 00:00:00 2001 From: Mike Makonnen Date: Mon, 1 Dec 2003 16:35:57 +0000 Subject: [PATCH] When clearing /tmp, X11 lock and temporary files are special. Remove them unconditionaly. PR: bin/59065 Approved by: re (scottl) --- etc/rc.d/cleartmp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/etc/rc.d/cleartmp b/etc/rc.d/cleartmp index e786824ef16c..f3084016f7fc 100755 --- a/etc/rc.d/cleartmp +++ b/etc/rc.d/cleartmp @@ -27,20 +27,20 @@ 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) - - case ${OSTYPE} in - FreeBSD) - # Remove X lock files, since they will prevent you from - # restarting X - # - rm -f /tmp/.X*-lock - rm -fr /tmp/.X11-unix - mkdir -m 1777 /tmp/.X11-unix - ;; - NetBSD) - ;; - esac } load_rc_config $name run_rc_command "$1" + +case ${OSTYPE} in +FreeBSD) + # Remove X lock files, since they will prevent you from + # restarting X + # + rm -f /tmp/.X*-lock + rm -fr /tmp/.X11-unix + mkdir -m 1777 /tmp/.X11-unix + ;; +NetBSD) + ;; +esac