From 6a6c535eac4f6b96d3d54587cb72c13b0cfedcd1 Mon Sep 17 00:00:00 2001
From: dougb <dougb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 1 Dec 2011 05:52:50 +0000
Subject: [PATCH] MFC r228122:

If using DESTDIR we need to be sure to create a
${DESTDIR}/var/db/zoneinfo

Approved by:	re (kensmith)


git-svn-id: svn://svn.freebsd.org/base/releng/9.0@228170 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 usr.sbin/mergemaster/mergemaster.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 6b5003e0..eb10bbae 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -1336,14 +1336,14 @@ esac
 
 if [ -e "${DESTDIR}/etc/localtime" ]; then	# Ignore if TZ == UTC
   echo ''
+  [ -n "${DESTDIR}" ] && tzs_args="-C ${DESTDIR}"
   if [ -f "${DESTDIR}/var/db/zoneinfo" ]; then
     echo "*** Reinstalling `cat ${DESTDIR}/var/db/zoneinfo` as ${DESTDIR}/etc/localtime"
-    [ -n "${DESTDIR}" ] && tzs_args="-C ${DESTDIR}"
     tzsetup $tzs_args -r
   else
     echo "*** There is no ${DESTDIR}/var/db/zoneinfo file to update ${DESTDIR}/etc/localtime."
     echo '    You should run tzsetup'
-    run_it_now tzsetup
+    run_it_now "tzsetup $tzs_args"
   fi
 fi
 
-- 
2.42.0