mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-20 11:11:24 +00:00
Code Issues Releases Activity

Don't mess with /etc/localtime if it is a symlink.

Browse Source
This commit is contained in:
Peter Wemm 2013-05-22 19:00:05 +00:00
parent eb8b73d6ae
commit 41b886b61c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=250916
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/mergemaster/mergemaster.sh
View File

@ -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