Date: Fri, 22 Jan 2010 16:19:07 GMT From: Anton Yuzhaninov <citrin@citrin.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: dougb@FreeBSD.org Subject: bin/143089: mergemaster(8) does not honor -D when select path to mtree file (for -U) Message-ID: <201001221619.o0MGJ7Kg007805@x0045.mgmt.vega.ru> Resent-Message-ID: <201001221620.o0MGK2nH030011@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001221619.o0MGJ7Kg007805>