[Pkg-sysvinit-commits] r555 - in sysvinit/trunk/debian: . initscripts/etc/init.d

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-09 15:16:23 +0000 (Mon, 09 Jan 2006)
New Revision: 555

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh
Log:
Eliminate unnecessary uses of subshell

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-01-09 13:17:58 UTC (rev 554)
+++ sysvinit/trunk/debian/changelog	2006-01-09 15:16:23 UTC (rev 555)
@@ -1,7 +1,8 @@
-sysvinit (2.86.ds1-10~1) unstable; urgency=low
+sysvinit (2.86.ds1-10~2) unstable; urgency=low
 
   [ Thomas Hood ]
   * rcS(5): Reword
+  * bootclean.sh: Eliminate unnecessary uses of subshell
 
  -- Thomas Hood <jdthood at yahoo.co.uk>  Mon,  9 Jan 2006 14:16:02 +0100
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh	2006-01-09 13:17:58 UTC (rev 554)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh	2006-01-09 15:16:23 UTC (rev 555)
@@ -59,7 +59,7 @@
 		! ( -path ./.clean -uid 0 )
 		! ( -path './...security*' -uid 0 )'
 
-	(
+	CLEANTMP_SAVE_PWD="$PWD"
 		if cd /tmp && [ "$(find . -maxdepth 0 -perm -002)" = "." ]
 		then
 			# First remove all old files...
@@ -71,7 +71,7 @@
 				-print0 | xargs -0r rmdir --ignore-fail-on-non-empty --
 			rm -f .X*-lock
 		fi
-	)
+	cd "$CLEANTMP_SAVE_PWD"
 	[ "$VERBOSE" != no ] && log_action_end_msg 0
 }
 
@@ -81,11 +81,11 @@
 	#
 	[ -f /var/lock/.clean ] && return
 	[ "$VERBOSE" != no ] && log_action_begin_msg "Cleaning /var/lock"
-	(
+	CLEANLOCK_SAVE_PWD="$PWD"
 		cd /var/lock \
 		&& find . ! -type d \
 			-print0 | xargs -0r rm -f --
-	)
+	cd "$CLEANLOCK_SAVE_PWD"
 	rm -f /var/lock/.clean
 	set -o noclobber
 	:> /var/lock/.clean
@@ -99,11 +99,11 @@
 	#
 	[ -f /var/run/.clean ] && return
 	[ "$VERBOSE" != no ] && log_action_begin_msg "Cleaning /var/run"
-	(
+	CLEANRUN_SAVE_PWD="$PWD"
 		cd /var/run \
 		&& find . ! -xtype d ! -name utmp ! -name innd.pid \
 			-print0 | xargs -0r rm -f --
-	)
+	cd "$CLEANRUN_SAVE_PWD"
 	rm -f /var/run/.clean
 	set -o noclobber
 	:> /var/run/.clean