summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2004-01-04 22:02:04 +0000
committerdougb <dougb@FreeBSD.org>2004-01-04 22:02:04 +0000
commit2890db9e398c22877adec5feef705184407773b9 (patch)
tree30379117309b9a950b37ff9181522e9dcf843341
parent389bb3f2740d927f4df014cafb327e374ba754f2 (diff)
downloadFreeBSD-src-2890db9e398c22877adec5feef705184407773b9.zip
FreeBSD-src-2890db9e398c22877adec5feef705184407773b9.tar.gz
mergemaster -p (pre-world) doesn't populate /etc/rc.d, which led to a
false positive for every file according to the new stale rc.d checker. Friendly reminder by: dhw
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh9
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index e6ac06f..a4ffa3c 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -781,10 +781,10 @@ echo ''
echo "*** Beginning comparison"
echo ''
+# Pre-world does not populate /etc/rc.d.
# It is very possible that a previous run would have deleted files in
# ${TEMPROOT}/etc/rc.d, thus creating a lot of false positives.
-case "${RERUN}" in
-'')
+if [ -z "${PRE_WORLD}" -a -z "${RERUN}" ]; then
echo " *** Checking ${DESTDIR}/etc/rc.d for stale files"
echo ''
cd "${DESTDIR}/etc/rc.d" &&
@@ -809,7 +809,7 @@ case "${RERUN}" in
case "${AUTO_RUN}" in
'')
echo ''
- echo -n ' *** Delete them now? [y]'
+ echo -n ' *** Delete them now? [y] '
read DELETE_STALE_RC_FILES
case "${DELETE_STALE_RC_FILES}" in
[nN])
@@ -827,8 +827,7 @@ case "${RERUN}" in
;;
esac
echo ''
- ;;
-esac
+fi
cd "${TEMPROOT}"
OpenPOWER on IntegriCloud