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

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-05 15:55:10 +0000 (Thu, 05 Jan 2006)
New Revision: 534

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh
Log:
Improve, homogenize file deletion code.  Do not make use of new (since sarge) features of find yet.  Use xargs so that only one process is created to do each set of deletions.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-01-05 15:38:40 UTC (rev 533)
+++ sysvinit/trunk/debian/changelog	2006-01-05 15:55:10 UTC (rev 534)
@@ -1,4 +1,4 @@
-sysvinit (2.86.ds1-9~9) experimental; urgency=low
+sysvinit (2.86.ds1-9~10) experimental; urgency=low
 
   [ Thomas Hood ]
   * Split mountdevsubfs out of mountvirtfs and run it at S04 and S37.
@@ -8,6 +8,7 @@
   * umountfs: Only run umount if there is something to unmount
     (Closes: #345272)
   * urandom: Set PATH so that find can be found  (Closes: #345273)
+  * bootclean.sh: Improve, homogenize file deletion code
   * init: 64_init_set_PATH.dpatch: Set PATH if it's unset on re-exec
     (Closes: #345370)
   * init: 65_init_u_in_06.dpatch: Allow 'telinit u' in runlevels 0, 6

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh	2006-01-05 15:38:40 UTC (rev 533)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh	2006-01-05 15:55:10 UTC (rev 534)
@@ -65,10 +65,10 @@
 			# First remove all old files...
 			# (Use xargs here so that only one additional process gets created)
 			find . -depth -xdev $TEXPR $EXCEPT ! -type d \
-				-print0 | xargs -0r rm -f
+				-print0 | xargs -0r rm -f --
 			# ...and then all empty directories
 			find . -depth -xdev $DEXPR $EXCEPT -type d -empty \
-				-exec rmdir \{\} \;
+				-print0 | xargs -0r rmdir --ignore-fail-on-non-empty --
 			rm -f .X*-lock
 		fi
 	)
@@ -84,7 +84,7 @@
 	(
 		cd /var/lock \
 		&& find . ! -type d \
-			-exec rm -f -- {} \;
+			-print0 | xargs -0r rm -f --
 	)
 	rm -f /var/lock/.clean
 	set -o noclobber
@@ -102,7 +102,7 @@
 	(
 		cd /var/run \
 		&& find . ! -xtype d ! -name utmp ! -name innd.pid \
-			-exec rm -f -- {} \;
+			-print0 | xargs -0r rm -f --
 	)
 	rm -f /var/run/.clean
 	set -o noclobber