diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2013-05-22 19:00:05 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2013-05-22 19:00:05 +0000 |
| commit | 41b886b61c7201f135967973b87a53dd234cc7a7 (patch) | |
| tree | 09af91061a42be2def069d827a130cc10459171a /usr.sbin/mergemaster | |
| parent | eb8b73d6ae15a80ef5e16be3e82b97750fd5a1c6 (diff) | |
| download | src-test2-41b886b61c7201f135967973b87a53dd234cc7a7.tar.gz src-test2-41b886b61c7201f135967973b87a53dd234cc7a7.zip | |
Notes
Diffstat (limited to 'usr.sbin/mergemaster')
| -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 a44d22bcea37..629d44fbd8ea 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 |