From 2c2ace3b8c391adbe0c45e58f7766aa31c55e842 Mon Sep 17 00:00:00 2001 From: dougb Date: Sat, 16 May 2009 21:32:09 +0000 Subject: Add -L to the mtree invocation to chase symbolic links that are present in "Service jails." Submitted by: Jeremie Le Hen --- usr.sbin/mergemaster/mergemaster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr.sbin/mergemaster') diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index e444996..9b8c656 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -461,7 +461,7 @@ MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk" # 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" -- cgit v1.1