[Pkg-sysvinit-commits] r280 - sysvinit/trunk/debian/initscripts/etc/init.d

[Thomas Hood]

Author: jdthood-guest
Date: 2005-11-25 10:31:56 +0000 (Fri, 25 Nov 2005)
New Revision: 280

Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh
Log:
Don't source other things from bootclean.sh

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh	2005-11-25 10:17:20 UTC (rev 279)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh	2005-11-25 10:31:56 UTC (rev 280)
@@ -2,19 +2,22 @@
 # bootclean.sh	Functions to clean /tmp, /var/run and /var/lock.
 #
 
-[ "$VERBOSE" ] || VERBOSE=yes
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-. /lib/init/set-rcS-vars.sh
+# Environment variables should be set by the caller
 
-. /lib/lsb/init-functions
+# /lib/lsb/init-functions must be sourced by the caller
 
 cleantmp() {
 	[ -f /tmp/.clean ] && return
-	[ -z "$TMPTIME" ] && TMPTIME=0
 
-	# Don't clean /tmp if TMPTIME < 0 or "infinite".
+	if [ -z "$TMPTIME" ]
+	then
+		log_warning_msg "Defaulting to TMPTIME=0."
+		TMPTIME=0
+	fi
+
+	# Don't clean /tmp if TMPTIME < 0 or "infinite"
 	case "$TMPTIME" in
-	  -*|infinite)
+	  -*|infinite|infinity)
 		return
 		;;
 	esac