Date: Thu, 1 Dec 2011 05:52:50 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r228170 - releng/9.0/usr.sbin/mergemaster Message-ID: <201112010552.pB15qoj7030644@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Thu Dec 1 05:52:50 2011 New Revision: 228170 URL: http://svn.freebsd.org/changeset/base/228170 Log: MFC r228122: If using DESTDIR we need to be sure to create a ${DESTDIR}/var/db/zoneinfo Approved by: re (kensmith) Modified: releng/9.0/usr.sbin/mergemaster/mergemaster.sh Directory Properties: releng/9.0/usr.sbin/mergemaster/ (props changed) Modified: releng/9.0/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- releng/9.0/usr.sbin/mergemaster/mergemaster.sh Thu Dec 1 05:51:17 2011 (r228169) +++ releng/9.0/usr.sbin/mergemaster/mergemaster.sh Thu Dec 1 05:52:50 2011 (r228170) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112010552.pB15qoj7030644>