summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster/mergemaster.sh
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2002-08-05 01:03:12 +0000
committerdougb <dougb@FreeBSD.org>2002-08-05 01:03:12 +0000
commita7cb4356348a8a159791b6e63ba71b58f24e4f0d (patch)
tree4148e519bcc88ab56c6356a2222b058304c613de /usr.sbin/mergemaster/mergemaster.sh
parent6e0282cae229cf6c5f070ff7c94ad62346f33b3e (diff)
downloadFreeBSD-src-a7cb4356348a8a159791b6e63ba71b58f24e4f0d.zip
FreeBSD-src-a7cb4356348a8a159791b6e63ba71b58f24e4f0d.tar.gz
Fix a couple DESTDIR related problems. Credit for the "Only in" section
goes to James <James_Bond_79@yahoo.com>, and Cyrille Lefevre <cyrille.lefevre@laposte.net>. The make variables problem was found by jon.
Diffstat (limited to 'usr.sbin/mergemaster/mergemaster.sh')
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index ecf134c..6fdcd02 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -533,7 +533,7 @@ case "${RERUN}" in
echo ' might want to verify their status before rebooting your system.'
echo ''
press_to_continue
- diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in /etc" | ${PAGER}
+ diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in ${DESTDIR}/etc" | ${PAGER}
echo ''
press_to_continue
;;
@@ -1019,7 +1019,7 @@ case "${PRE_WORLD}" in
echo "*** From ${DESTDIR}/etc/make.conf"
echo "*** From ${MAKE_CONF}"
- for MAKE_VAR in `grep -i ^[a-z] /etc/make.conf | cut -d '=' -f 1`; do
+ for MAKE_VAR in `grep -i ^[a-z] ${DESTDIR}/etc/make.conf | cut -d '=' -f 1`; do
echo ''
grep -w ^${MAKE_VAR} ${DESTDIR}/etc/make.conf
grep -w ^#${MAKE_VAR} ${MAKE_CONF} ||
OpenPOWER on IntegriCloud