--- trunk/magellan-initscripts/etc/rc.d/init.d/cleanfs	2005/03/15 19:07:56	71
+++ trunk/magellan-initscripts/etc/rc.d/init.d/cleanfs	2005/05/11 12:34:04	74
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/cleanfs,v 1.3 2005-03-15 19:07:50 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/cleanfs,v 1.4 2005-05-11 12:34:04 niro Exp $
 
 #%rlevels: 7:s
 #%start: 50
@@ -13,28 +13,17 @@
 source /etc/sysconfig/rc
 source $rc_functions
 
-echo -e ${COLOREDSTAR}"Removing /var/run/* and /var/lock/* ..."
-for i in /var/run/*
+for dir in /tmp /var/run /var/lock
 do
-	if [ -d ${i} ]
-	then
-		rm -rf ${i}/*
-	else
-		rm -f ${i}
-	fi
+	echo -e ${COLOREDSTAR}"Removing tmp files in ${dir}/* and /var/lock/* ..."
+	for file in $(find ${dir} -type f)
+	do
+		[[ $(basename ${file}) == .keep ]] && continue
+		rm -f ${file}
+	done
+	evaluate_retval
 done
 
-for i in /var/lock/*
-do
-	if [ -d ${i} ]
-	then
-		rm -rf ${i}/*
-	else
-		rm -f ${i}
-	fi
-done
-evaluate_retval
-
 echo -e ${COLOREDSTAR}"Creating new /var/run/utmp ..."
 touch /var/run/utmp && chmod 644 /var/run/utmp
 evaluate_retval