From 07509279d3920118d263ca9d0ab6a07d35cf4218 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 9 Sep 2014 17:03:58 +0000
Subject: [PATCH] Don't cross mount boundaries when cleaning tmp files.

Mounting something in /tmp such as a build jail with nullfs mounts for
some directories can result in very surprising results the next day.

MFC after:	2 weeks
Relnotes:	yes
---
 etc/periodic/daily/110.clean-tmps | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/periodic/daily/110.clean-tmps b/etc/periodic/daily/110.clean-tmps
index eef3bc6545b5..67bcec6f00d3 100755
--- a/etc/periodic/daily/110.clean-tmps
+++ b/etc/periodic/daily/110.clean-tmps
@@ -45,8 +45,8 @@ case "$daily_clean_tmps_enable" in
 	    rc=$(for dir in $daily_clean_tmps_dirs
 		do
 		    [ ."${dir#/}" != ."$dir" -a -d $dir ] && cd $dir && {
-			find -d . -type f $args -delete $print
-			find -d . ! -name . -type d $dargs -delete $print
+			find -x -d . -type f $args -delete $print
+			find -x -d . ! -name . -type d $dargs -delete $print
 		    } | sed "s,^\\.,  $dir,"
 		done | tee /dev/stderr | wc -l)
 	    [ -z "$print" ] && rc=0