diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2010-01-26 18:24:13 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2010-01-26 18:24:13 +0000 |
| commit | 5915044ff5d9fd4a18d55b5c50be94daf0aa36e6 (patch) | |
| tree | 33904cd46783bbaab42782c368aa5ccf3345e8c1 /usr.sbin | |
| parent | aae70d8491e2f3e9f3bb95be67f3016f4a515f52 (diff) | |
Notes
Diffstat (limited to 'usr.sbin')
| -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 1b0753b8925d..d21d80bcfd17 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` |
