mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-04 09:09:56 +00:00
Code Issues Releases Activity

mergemaster -p (pre-world) doesn't populate /etc/rc.d, which led to a

Browse Source 
false positive for every file according to the new stale rc.d checker.

Friendly reminder by:	dhw
This commit is contained in:
Doug Barton 2004-01-04 22:02:04 +00:00
parent 137bcec3f9
commit d71c565b9c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=124136
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.sbin/mergemaster/mergemaster.sh
View File

@ -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}"