diff options
| author | dougb <dougb@FreeBSD.org> | 2010-01-22 17:17:47 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2010-01-22 17:17:47 +0000 |
| commit | 6f01777da83a92f207d22f531ce63bf764e50bc9 (patch) | |
| tree | c087098aa8fef439c2e14ae6cf1c8b7f36d5025b /usr.sbin/mergemaster | |
| parent | f907bb85100c4acac04705abd5dba080f858fffb (diff) | |
| download | FreeBSD-src-6f01777da83a92f207d22f531ce63bf764e50bc9.zip FreeBSD-src-6f01777da83a92f207d22f531ce63bf764e50bc9.tar.gz | |
Make -U once again honor -D after my change to consolidate setting
of MTREEDB with DESTDIR.
PR: bin/143089
Submitted by: Anton Yuzhaninov <citrin@citrin.ru>
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 1bb5915..2fa9906 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -261,11 +261,6 @@ if [ -r "$HOME/.mergemasterrc" ]; then . "$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 @@ while getopts ":ascrvhipCPm:t:du:w:D:A:FU" COMMAND_LINE_ARGUMENT ; do 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` |
