From 5eee702d0a8af2feeaf01a214852e62abf64ac24 Mon Sep 17 00:00:00 2001
From: peter <peter@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Mon, 5 May 2014 19:35:02 +0000
Subject: [PATCH] MFC r250916: coexist with /etc/localtime being a symlink

git-svn-id: svn://svn.freebsd.org/base/stable/9@265383 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 usr.sbin/mergemaster/mergemaster.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 1366f56ae..361cef914 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -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
-- 
2.45.2