From d71c565b9caeec91fe6abf1e437646515141878b Mon Sep 17 00:00:00 2001
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 4 Jan 2004 22:02:04 +0000
Subject: [PATCH] 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
---
 usr.sbin/mergemaster/mergemaster.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index e6ac06fbf84c..a4ffa3cf0fa6 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}"