From owner-freebsd-stable@FreeBSD.ORG  Fri Dec 16 23:57:47 2011
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35])
	by hub.freebsd.org (Postfix) with ESMTP id 76074106566B
	for <freebsd-stable@freebsd.org>; Fri, 16 Dec 2011 23:57:45 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from 172-17-198-245.globalsuite.net (hub.freebsd.org
	[IPv6:2001:4f8:fff6::36])
	by mx2.freebsd.org (Postfix) with ESMTP id 7D1FB14E0E4;
	Fri, 16 Dec 2011 23:57:44 +0000 (UTC)
Message-ID: <4EEBDAF8.20200@FreeBSD.org>
Date: Fri, 16 Dec 2011 15:57:44 -0800
From: Doug Barton <dougb@FreeBSD.org>
Organization: http://SupersetSolutions.com/
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
	rv:8.0) Gecko/20111110 Thunderbird/8.0
MIME-Version: 1.0
To: Christian Weisgerber <naddy@mips.inka.de>
References: <jbdf06$294$1@lorvorc.mips.inka.de>
In-Reply-To: <jbdf06$294$1@lorvorc.mips.inka.de>
X-Enigmail-Version: undefined
OpenPGP: id=1A1ABC84
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: freebsd-stable@freebsd.org
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 <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Dec 2011 23:57:47 -0000

On 12/03/2011 07: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.

Once again, my apologies for assuming that my esteemed colleagues had
done the responsible thing and MFC'ed their own work.

I have resolved this issue by going back and doing 3 1/2 years of MFCs
for tzsetup(8), which now makes it identical to the code in stable/8. If
you update your src tree and then update tzsetup you should no longer
experience this problem.


Doug

-- 

		[^L]

	Breadth of IT experience, and depth of knowledge in the DNS.
	Yours for the right price.  :)  http://SupersetSolutions.com/