From owner-freebsd-stable@FreeBSD.ORG  Sun Dec  4 00:12:13 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 6922B106566C;
	Sun,  4 Dec 2011 00:12:13 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from [127.0.0.1] (hub.freebsd.org [IPv6:2001:4f8:fff6::36])
	by mx2.freebsd.org (Postfix) with ESMTP id EFA49153D54;
	Sun,  4 Dec 2011 00:12:12 +0000 (UTC)
Message-ID: <4EDABADD.9000009@FreeBSD.org>
Date: Sat, 03 Dec 2011 16:12:13 -0800
From: Doug Barton <dougb@FreeBSD.org>
Organization: http://www.FreeBSD.org/
User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:8.0) Gecko/20111105 Thunderbird/8.0
MIME-Version: 1.0
To: Max Khon <fjoe@samodelkin.net>
References: <jbdf06$294$1@lorvorc.mips.inka.de>
	<CADe0-4kwFWkNCkYLac8ZayzxNi09XCK1mF6dxGgT0DH0vCav+g@mail.gmail.com>
In-Reply-To: <CADe0-4kwFWkNCkYLac8ZayzxNi09XCK1mF6dxGgT0DH0vCav+g@mail.gmail.com>
X-Enigmail-Version: 1.3.3
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: freebsd-stable@freebsd.org, Christian Weisgerber <naddy@mips.inka.de>,
	edwin@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: Sun, 04 Dec 2011 00:12:13 -0000

On 12/3/2011 8:14 AM, Max Khon wrote:
> Christian,
> 
> On Sat, Dec 3, 2011 at 10:24 PM, Christian Weisgerber
> <naddy@mips.inka.de> 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 in FreeBSD 8 and later creates /var/db/zoneinfo. It seems that
> mergemaster was merged to RELENG_7 but appropiate version of tzsetup
> was not.

Well that's embarrassing. :)

Edwin, what are the chances that you could MFC your changes to tzsetup?


Doug

-- 

		"We could put the whole Internet into a book."
		"Too practical."

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