From owner-freebsd-bugs@FreeBSD.ORG Fri Jan 22 16:20:02 2010 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 9CA0A1065706 for ; Fri, 22 Jan 2010 16:20:02 +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 75CC08FC16 for ; Fri, 22 Jan 2010 16:20:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o0MGK2aT030012 for ; Fri, 22 Jan 2010 16:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o0MGK2nH030011; Fri, 22 Jan 2010 16:20:02 GMT (envelope-from gnats) Resent-Date: Fri, 22 Jan 2010 16:20:02 GMT Resent-Message-Id: <201001221620.o0MGK2nH030011@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, Anton Yuzhaninov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22B6F1065670 for ; Fri, 22 Jan 2010 16:19:09 +0000 (UTC) (envelope-from citrin@citrin.ru) Received: from mail.vega.ru (mail.vega.ru [90.156.167.5]) by mx1.freebsd.org (Postfix) with ESMTP id CF9528FC13 for ; Fri, 22 Jan 2010 16:19:08 +0000 (UTC) Received: from storage.spylog.stage.vega.ru ([10.25.1.96] helo=x0045.mgmt.vega.ru) by mail.vega.ru with esmtps (TLSv1:AES256-SHA:256) (Exim 4.71 (FreeBSD)) (envelope-from ) id 1NYMDz-000LgN-T2; Fri, 22 Jan 2010 19:19:07 +0300 Received: from x0045.mgmt.vega.ru (localhost [127.0.0.1]) by x0045.mgmt.vega.ru (8.14.3/8.14.3) with ESMTP id o0MGJ7Nt007806; Fri, 22 Jan 2010 16:19:07 GMT (envelope-from citrin@citrin.ru) Received: (from ayuzhaninov@localhost) by x0045.mgmt.vega.ru (8.14.3/8.14.3/Submit) id o0MGJ7Kg007805; Fri, 22 Jan 2010 16:19:07 GMT (envelope-from citrin@citrin.ru) Message-Id: <201001221619.o0MGJ7Kg007805@x0045.mgmt.vega.ru> Date: Fri, 22 Jan 2010 16:19:07 GMT From: Anton Yuzhaninov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: dougb@FreeBSD.org Subject: bin/143089: mergemaster(8) does not honor -D when select path to mtree file (for -U) X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jan 2010 16:20:02 -0000 >Number: 143089 >Category: bin >Synopsis: mergemaster(8) does not honor -D when select path to mtree file (for -U) >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: Fri Jan 22 16:20:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Anton Yuzhaninov >Release: FreeBSD 7.2-STABLE-20100121 amd64 >Organization: >Environment: # $FreeBSD: src/usr.sbin/mergemaster/mergemaster.sh,v 1.54.2.7 2010/01/15 03:39:03 dougb Exp $ >Description: for -U /var/db/mergemaster.mtree always used, even when -D (DESTDIR) is not empty >How-To-Repeat: run mergemaster -U -D /path/to/jail /var/db/mergemaster.mtree will be used, instead /path/to/jail/var/db/mergemaster.mtree >Fix: Move MTREEDB/MTREEFILE variables assignment after command line options read --- mergemaster.patch begins here --- --- /usr/sbin/mergemaster 2010-01-21 13:33:41.000000000 +0000 +++ mergemaster 2010-01-22 14:44:27.000000000 +0000 @@ -261,11 +261,6 @@ . "$HOME/.mergemasterrc" fi -# Assign the location of the mtree database -# -MTREEDB=${MTREEDB:-${DESTDIR}/var/db} -MTREEFILE="${MTREEDB}/mergemaster.mtree" - # Check the command line options # while getopts ":ascrvhipCPm:t:du:w:D:A:FU" COMMAND_LINE_ARGUMENT ; do @@ -342,6 +337,11 @@ esac done +# Assign the location of the mtree database +# +MTREEDB=${MTREEDB:-${DESTDIR}/var/db} +MTREEFILE="${MTREEDB}/mergemaster.mtree" + # Don't force the user to set this in the mergemaster rc file if [ -n "${PRESERVE_FILES}" -a -z "${PRESERVE_FILES_DIR}" ]; then PRESERVE_FILES_DIR=/var/tmp/mergemaster/preserved-files-`date +%y%m%d-%H%M%S` --- mergemaster.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: