Date: Sat, 16 May 2009 21:32:09 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r192219 - head/usr.sbin/mergemaster Message-ID: <200905162132.n4GLW91H004551@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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@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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905162132.n4GLW91H004551>