Date: Tue, 29 Nov 2011 08:22:12 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r228122 - head/usr.sbin/mergemaster Message-ID: <201111290822.pAT8MCSD031117@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Tue Nov 29 08:22:12 2011 New Revision: 228122 URL: http://svn.freebsd.org/changeset/base/228122 Log: If using DISTDIR we need to be sure to create a ${DESTDIR}/var/db/zoneinfo PR: bin/162891 Submitted by: Helge Oldach <src-mergemaster-nov11@oldach.net> Modified: head/usr.sbin/mergemaster/mergemaster.sh Modified: head/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- head/usr.sbin/mergemaster/mergemaster.sh Tue Nov 29 08:21:54 2011 (r228121) +++ head/usr.sbin/mergemaster/mergemaster.sh Tue Nov 29 08:22:12 2011 (r228122) @@ -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?201111290822.pAT8MCSD031117>