From owner-freebsd-stable@FreeBSD.ORG Sat Dec 3 16:46:11 2011 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B36B106566B; Sat, 3 Dec 2011 16:46:11 +0000 (UTC) (envelope-from m.seaman@infracaninophile.co.uk) Received: from smtp.infracaninophile.co.uk (smtp6.infracaninophile.co.uk [IPv6:2001:8b0:151:1:3cd3:cd67:fafa:3d78]) by mx1.freebsd.org (Postfix) with ESMTP id 0BBC48FC08; Sat, 3 Dec 2011 16:46:10 +0000 (UTC) Received: from seedling.black-earth.co.uk (seedling.black-earth.co.uk [IPv6:2001:8b0:151:1:fa1e:dfff:feda:c0bb]) (authenticated bits=0) by smtp.infracaninophile.co.uk (8.14.5/8.14.5) with ESMTP id pB3Gk7uu097521 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Sat, 3 Dec 2011 16:46:07 GMT (envelope-from m.seaman@infracaninophile.co.uk) X-DKIM: OpenDKIM Filter v2.4.1 smtp.infracaninophile.co.uk pB3Gk7uu097521 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=infracaninophile.co.uk; s=201001-infracaninophile; t=1322930767; bh=JEIrO0xDaa6LaOX3D6bDl2oi5tNQoIEK4jLDd0PhGbA=; h=Message-ID:Date:From:MIME-Version:To:CC:Subject:References: In-Reply-To:Content-Type; b=RVa9J0u6QbDqOuqRWQck0V+QLS1ePiiQgaT+U+/5gyOiJ+ZE1pD9VXLuT2ClPGP+O R8z6i1lDwn0XsblGkxhfng1WRFDpz+iUU51LWrjUBqEHSMz9b0MAppW+Y+fAFbEHby g9lYp2OXkjgyUSRN6gSVWlr6XvPI4mObdx4iLEHM= Message-ID: <4EDA5246.805@infracaninophile.co.uk> Date: Sat, 03 Dec 2011 16:45:58 +0000 From: Matthew Seaman User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:8.0) Gecko/20111105 Thunderbird/8.0 MIME-Version: 1.0 To: freebsd-stable@freebsd.org References: In-Reply-To: X-Enigmail-Version: 1.3.3 OpenPGP: id=60AE908C Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig41CB839889737CFB80E0ECE5" X-Virus-Scanned: clamav-milter 0.97.3 at lucid-nonsense.infracaninophile.co.uk X-Virus-Status: Clean X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_FAIL autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on lucid-nonsense.infracaninophile.co.uk Cc: Doug Barton Subject: Re: 7-STABLE: mergemaster tzsetup question X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2011 16:46:11 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig41CB839889737CFB80E0ECE5 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 03/12/2011 15:24, Christian Weisgerber wrote: > Every time I run mergemaster(8) on 7.4-STABLE, I'm now presented > with >=20 > *** There is no /var/db/zoneinfo file to update /etc/localtime. > You should run tzsetup >=20 > 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. >=20 > Where is /var/db/zoneinfo supposed to come from? >=20 > I also notice that mergemaster can issue tzsetup arguments -C and > -r, but tzsetup doesn't support those. >=20 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=3Drevision&revision=3D220183 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=3Drevision&revision=3D227150 Cheers, Matthew --=20 Dr Matthew J Seaman MA, D.Phil. 7 Priory Courtyard Flat 3 PGP: http://www.infracaninophile.co.uk/pgpkey Ramsgate JID: matthew@infracaninophile.co.uk Kent, CT11 9PW --------------enig41CB839889737CFB80E0ECE5 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.16 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk7aUk4ACgkQ8Mjk52CukIxk+wCeNB5Pjur2EeUb+p56GCYIxCTq WVYAoJL3+GLZti2dMhlaoJL+5cDILCRg =K1R/ -----END PGP SIGNATURE----- --------------enig41CB839889737CFB80E0ECE5--