svn commit: r192219 - head/usr.sbin/mergemaster

[Doug Barton]

Author: dougb
Date: Sat May 16 21:32:09 2009
New Revision: 192219
URL: http://svn.freebsd.org/changeset/base/192219

Log:
  Add -L to the mtree invocation to chase symbolic links that are present
  in "Service jails."
  
  Submitted by:	Jeremie Le Hen <jeremie at le-hen.org>

Modified:
  head/usr.sbin/mergemaster/mergemaster.sh

Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh	Sat May 16 21:08:32 2009	(r192218)
+++ head/usr.sbin/mergemaster/mergemaster.sh	Sat May 16 21:32:09 2009	(r192219)
@@ -461,7 +461,7 @@ MM_MAKE="make ${ARCHSTRING} -m ${SOURCED
 #
 CHANGED=
 if [ -n "${AUTO_UPGRADE}" -a -f "${DESTDIR}${MTREEFILE}" ]; then
-	for file in `mtree -eq -f ${DESTDIR}${MTREEFILE} -p ${DESTDIR}/ \
+	for file in `mtree -eqL -f ${DESTDIR}${MTREEFILE} -p ${DESTDIR}/ \
 		2>/dev/null | awk '($2 == "changed") {print $1}'`; do
 		if [ -f "${DESTDIR}/$file" ]; then
 			CHANGED="${CHANGED} ${DESTDIR}/$file"