svn commit: r193302 - head/etc/periodic/daily
Brian Somers
brian at FreeBSD.org
Tue Jun 2 07:35:52 UTC 2009
Author: brian
Date: Tue Jun 2 07:35:51 2009
New Revision: 193302
URL: http://svn.freebsd.org/changeset/base/193302
Log:
Rather than using both -prune (which requires directory-first tree traversal)
and -delete (which implies depth-first traversal), avoid using -delete in
favour of -execdir.
This has a side-effect of not removing directories that contain files,
even if we delete all of those files, but IMHO that's a better option
than specifying all possible local filesystem types in this script.
PR: 122811
MFC after: 3 weeks
Modified:
head/etc/periodic/daily/100.clean-disks
Modified: head/etc/periodic/daily/100.clean-disks
==============================================================================
--- head/etc/periodic/daily/100.clean-disks Tue Jun 2 06:55:32 2009 (r193301)
+++ head/etc/periodic/daily/100.clean-disks Tue Jun 2 07:35:51 2009 (r193302)
@@ -29,7 +29,7 @@ case "$daily_clean_disks_enable" in
echo ""
echo "Cleaning disks:"
set -f noglob
- args="$args -name "`echo "$daily_clean_disks_files" |
+ args="-name "`echo "$daily_clean_disks_files" |
sed -e 's/^[ ]*//' \
-e 's/[ ]*$//' \
-e 's/[ ][ ]*/ -o -name /g'`
@@ -41,9 +41,9 @@ case "$daily_clean_disks_enable" in
print=;;
esac
- rc=$(find / \( ! -fstype local -o -fstype rdonly \) -a -prune -o \
- \( $args \) -atime +$daily_clean_disks_days -delete $print |
- tee /dev/stderr | wc -l)
+ rc=$(find / \( ! -fstype local -o -fstype rdonly \) -prune -o \
+ \( $args \) -atime +$daily_clean_disks_days \
+ -execdir rm -df {} \; $print | tee /dev/stderr | wc -l)
[ -z "$print" ] && rc=0
[ $rc -gt 1 ] && rc=1
set -f glob
More information about the svn-src-all
mailing list