diff options
| author | dougb <dougb@FreeBSD.org> | 2009-05-16 21:32:09 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2009-05-16 21:32:09 +0000 |
| commit | 2c2ace3b8c391adbe0c45e58f7766aa31c55e842 (patch) | |
| tree | dc96c99a01eb1450b3458baf5cf898076201711e /usr.sbin | |
| parent | 72b79c824bf01f844c68c90284d8ba24c0797e75 (diff) | |
| download | FreeBSD-src-2c2ace3b8c391adbe0c45e58f7766aa31c55e842.zip FreeBSD-src-2c2ace3b8c391adbe0c45e58f7766aa31c55e842.tar.gz | |
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>
Diffstat (limited to 'usr.sbin')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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" |
