Date: Mon, 5 May 2014 19:35:03 +0000 (UTC) From: Peter Wemm <peter@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r265383 - stable/9/usr.sbin/mergemaster Message-ID: <201405051935.s45JZ3NA038757@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405051935.s45JZ3NA038757>