7-STABLE: mergemaster tzsetup question

[Matthew Seaman]

On 03/12/2011 15:24, Christian Weisgerber wrote:
> Every time I run mergemaster(8) on 7.4-STABLE, I'm now presented
> with
> 
> *** There is no /var/db/zoneinfo file to update /etc/localtime.
>     You should run tzsetup
> 
> Running tzsetup(8) does however not create /var/db/zoneinfo, so
> mergemaster will prompt the next time, too.  I guess I can just
> ignore it, but it seems weird that mergemaster would keep nagging
> about this.
> 
> Where is /var/db/zoneinfo supposed to come from?
> 
> I also notice that mergemaster can issue tzsetup arguments -C and
> -r, but tzsetup doesn't support those.
> 

tzsetup(8) does create /var/db/zoneinfo in 8.2-STABLE.  It's just a
very small text file containing the default timezone name -- eg. I have:

% cat zoneinfo
Europe/London

Just creating that file will quiet mergemaster, although it won't be of
any use to tzsetup in 7.4-STABLE. Looks like this MFC only went into
stable/8, and not stable/7:

http://svnweb.freebsd.org/base?view=revision&revision=220183

but the related /var/db/zoneinfo code in mergemaster was merged to
stable/7 (as well as stable/8):

http://svnweb.freebsd.org/base?view=revision&revision=227150

	Cheers,

	Matthew


-- 
Dr Matthew J Seaman MA, D.Phil.                   7 Priory Courtyard
                                                  Flat 3
PGP: http://www.infracaninophile.co.uk/pgpkey     Ramsgate
JID: matthew at infracaninophile.co.uk               Kent, CT11 9PW

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 267 bytes
Desc: OpenPGP digital signature
Url : http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20111203/f616b1f3/signature.pgp