diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2011-12-01 05:52:50 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2011-12-01 05:52:50 +0000 |
| commit | 57f7bffb40f4e805b790d18201174542ab7befb3 (patch) | |
| tree | 0681d39a9fcf1b18fe9604570ee466c375022aeb | |
| parent | e6e12a8ca94bd77d51d84dd32eeb1505597ad4b3 (diff) | |
| download | src-57f7bffb40f4e805b790d18201174542ab7befb3.tar.gz src-57f7bffb40f4e805b790d18201174542ab7befb3.zip | |
Notes
| -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 6b5003e098c3..eb10bbaeb288 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 |