diff options
| author | dougb <dougb@FreeBSD.org> | 2011-11-29 08:22:12 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2011-11-29 08:22:12 +0000 |
| commit | c8bad4ab57fca0a86a4d8daf9277d97cce8e4f56 (patch) | |
| tree | 687c18ff69c6b0fa3e1f2f2224cd3144190e1e8b /usr.sbin/mergemaster | |
| parent | 8f78c40d6bb5da3dafa1ef58fede64c46ca25200 (diff) | |
| download | FreeBSD-src-c8bad4ab57fca0a86a4d8daf9277d97cce8e4f56.zip FreeBSD-src-c8bad4ab57fca0a86a4d8daf9277d97cce8e4f56.tar.gz | |
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>
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 6b5003e..eb10bba 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 |
