From owner-freebsd-bugs@FreeBSD.ORG Sat Nov 26 07:20:09 2011 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5ABCE106566C for ; Sat, 26 Nov 2011 07:20:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 323818FC0C for ; Sat, 26 Nov 2011 07:20:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id pAQ7K9E2055847 for ; Sat, 26 Nov 2011 07:20:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id pAQ7K9XO055846; Sat, 26 Nov 2011 07:20:09 GMT (envelope-from gnats) Resent-Date: Sat, 26 Nov 2011 07:20:09 GMT Resent-Message-Id: <201111260720.pAQ7K9XO055846@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Helge Oldach Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1E1E3106566B; Sat, 26 Nov 2011 07:18:03 +0000 (UTC) (envelope-from hmo@sep.oldach.net) Received: from rigel.oldach.net (rigel.oldach.net [194.8.96.250]) by mx1.freebsd.org (Postfix) with ESMTP id A781B8FC08; Sat, 26 Nov 2011 07:18:02 +0000 (UTC) Received: from sep.oldach.net (hmo.in-vpn.de [217.197.85.210]) by rigel.oldach.net (8.14.5/8.14.4/hmo30jul04) with ESMTP id pAQ6xNOc061936 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 26 Nov 2011 07:59:24 +0100 (CET) (envelope-from hmo@sep.oldach.net) Received: from sep.oldach.net (localhost [127.0.0.1]) by sep.oldach.net (8.14.5/8.14.5/hmo26jun05) with ESMTP id pAQ6xNfv053230 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 26 Nov 2011 07:59:23 +0100 (CET) (envelope-from hmo@sep.oldach.net) Received: (from hmo@localhost) by sep.oldach.net (8.14.5/8.14.5/Submit/hmo26jun05) id pAQ6xNig053229; Sat, 26 Nov 2011 07:59:23 +0100 (CET) (envelope-from hmo) Message-Id: <201111260659.pAQ6xNig053229@sep.oldach.net> Date: Sat, 26 Nov 2011 07:59:23 +0100 (CET) From: Helge Oldach To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Doug Barton Subject: bin/162891: [patch] mergemaster -D runs tzsetup improperly X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Helge Oldach List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Nov 2011 07:20:09 -0000 >Number: 162891 >Category: bin >Synopsis: [patch] mergemaster -D runs tzsetup improperly >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Nov 26 07:20:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Helge Oldach >Release: FreeBSD 8.2-1005 i386 >Organization: >Environment: System: FreeBSD localhost 8.2-1005 FreeBSD 8.2-1005 #0: Thu Nov 17 18:26:10 CET 2011 toor@localhost:/usr/obj/usr/src/sys/HMO i386 >Description: When mergemaster'ing a destination directory with the -D option, and no ${DESTDIR}/var/db/zoneinfo exists, tzsetup is not run chroot'ed. This causes tzsetup to create a fresh /var/db/zoneinfo instead of the intended ${DESTDIR}/var/db/zoneinfo. >How-To-Repeat: Run mergemaster twice without ${DESTDIR}/var/db/zoneinfo - it will run tzsetup again. >Fix: --- /usr/sbin/mergemaster~ 2011-11-17 22:08:54.000000000 +0100 +++ /usr/sbin/mergemaster 2011-11-26 07:44:41.000000000 +0100 @@ -1338,14 +1338,14 @@ 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 >Release-Note: >Audit-Trail: >Unformatted: