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

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-11 19:11:21 +0000 (Wed, 11 Jan 2006)
New Revision: 600

Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/bootclean
Log:
s/return/exit/

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootclean
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootclean	2006-01-11 18:54:25 UTC (rev 599)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootclean	2006-01-11 19:11:21 UTC (rev 600)
@@ -142,8 +142,8 @@
 	return 0
 }
 
-which find >/dev/null 2>&1 || return 1
-which xargs >/dev/null 2>&1 || return 1
+which find >/dev/null 2>&1 || exit 1
+which xargs >/dev/null 2>&1 || exit 1
 
 # If there are flag files that have not been created by root
 # then remove them
@@ -155,15 +155,15 @@
 		# Poor's man stat %u, since stat (and /usr) might not be
 		# available in some bootup stages
 		[ "$cleanuid" ] || cleanuid="$(find $D/.clean -printf %U)"
-		[ "$cleanuid" ] || { log_failure_msg "bootclean: Could not stat '$D/.clean'." ; return 1 ; }
+		[ "$cleanuid" ] || { log_failure_msg "bootclean: Could not stat '$D/.clean'." ; exit 1 ; }
 		if [ "$cleanuid" -ne 0 ]
 		then
-			rm -f $D/.clean || { log_failure_msg "bootclean: Could not delete '$D/.clean'." ; return 1 ; }
+			rm -f $D/.clean || { log_failure_msg "bootclean: Could not delete '$D/.clean'." ; exit 1 ; }
 		fi
 	fi
 done
 
-[ -f /tmp/.clean ] && [ -f /var/run/.clean ] && [ -f /var/lock/.clean ] && return 0
+[ -f /tmp/.clean ] && [ -f /var/run/.clean ] && [ -f /var/lock/.clean ] && exit 0
 
 ES=0
 [ -d /tmp ] && ! [ -f /tmp/.clean ] && { clean_tmp || ES=1 ; }