Author: peter
Date: Wed May 22 19:00:05 2013
New Revision: 250916
URL: http://svnweb.freebsd.org/changeset/base/250916
Log:
Don't mess with /etc/localtime if it is a symlink.
Modified:
head/usr.sbin/mergemaster/mergemaster.sh
Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh Wed May 22 18:26:12 2013
(r250915)
+++ head/usr.sbin/mergemaster/mergemaster.sh Wed May 22 19:00:05 2013
(r250916)
@@ -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-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
