Author: peter
Date: Mon May 5 19:35:02 2014
New Revision: 265383
URL: http://svnweb.freebsd.org/changeset/base/265383
Log:
MFC r250916: coexist with /etc/localtime being a symlink
Modified:
stable/9/usr.sbin/mergemaster/mergemaster.sh
Modified: stable/9/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/9/usr.sbin/mergemaster/mergemaster.sh Mon May 5 18:32:24
2014 (r265382)
+++ stable/9/usr.sbin/mergemaster/mergemaster.sh Mon May 5 19:35:02
2014 (r265383)
@@ -1327,7 +1327,7 @@ case "${NEED_PWD_MKDB}" in
;;
esac
-if [ -e "${DESTDIR}/etc/localtime" -a -z "${PRE_WORLD}" ]; then #
Ignore if TZ == UTC
+if [ -e "${DESTDIR}/etc/localtime" -a ! -L "${DESTDIR}/etc/localtime" -a -z
"${PRE_WORLD}" ]; then # Ignore if TZ == UTC
echo ''
[ -n "${DESTDIR}" ] && tzs_args="-C ${DESTDIR}"
if [ -f "${DESTDIR}/var/db/zoneinfo" ]; then
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
