Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Dec 2011 05:54:22 +0000 (UTC)
From:      Doug Barton <dougb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r228172 - stable/7/usr.sbin/mergemaster
Message-ID:  <201112010554.pB15sMK2030790@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dougb
Date: Thu Dec  1 05:54:22 2011
New Revision: 228172
URL: http://svn.freebsd.org/changeset/base/228172

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

Modified:
  stable/7/usr.sbin/mergemaster/mergemaster.sh
Directory Properties:
  stable/7/usr.sbin/mergemaster/   (props changed)

Modified: stable/7/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/7/usr.sbin/mergemaster/mergemaster.sh	Thu Dec  1 05:53:30 2011	(r228171)
+++ stable/7/usr.sbin/mergemaster/mergemaster.sh	Thu Dec  1 05:54:22 2011	(r228172)
@@ -1324,14 +1324,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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112010554.pB15sMK2030790>