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

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-29 14:59:11 +0000 (Sun, 29 Jan 2006)
New Revision: 712

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/bootclean
Log:
Don't fail to clean all directories in /tmp

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-01-27 16:30:53 UTC (rev 711)
+++ sysvinit/trunk/debian/changelog	2006-01-29 14:59:11 UTC (rev 712)
@@ -1,4 +1,4 @@
-sysvinit (2.86.ds1-12~5) unstable; urgency=low
+sysvinit (2.86.ds1-12~6) unstable; urgency=low
 
   [ Thomas Hood ]
   * bootlogd: 51_bootlogd_syncalot: Don't sync after each line unless
@@ -15,6 +15,8 @@
     (Closes: #58119)
   * init: 41_selinux_console.dpatch: print to same console as others do
     (Closes: #349149)
+  * bootclean: Don't fail to clean all directories in /tmp
+    (Closes: #350218)
   * checkroot.sh: Don't try to enable swap if a swap device is
     /dev/mapper/* or a swapfile  (Closes: #346329, #348534)
     Don't check for /dev/md* any more, since this was only necessary

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootclean
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootclean	2006-01-27 16:30:53 UTC (rev 711)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootclean	2006-01-29 14:59:11 UTC (rev 712)
@@ -105,9 +105,11 @@
 
 	#
 	# ...and then all empty directories
+	# (Don't use xargs here because dirs must be removed one by one from
+	# the bottom up)
 	#
 	find . -depth -xdev $DEXPR $EXCEPT -type d -empty \
-		-print0 | xargs -0r rmdir --ignore-fail-on-non-empty -- \
+		-exec rmdir \{\} \; \
 		|| { report_err ; return 1 ; }
 
 	[ "$VERBOSE" = no ] || log_action_end_msg 0