d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better handle the recent (desirable) change to create login.conf.db at

Browse Source 
install time, and make sure to catch any future .db files as well.
This commit is contained in:
Doug Barton 2003-03-05 08:20:55 +00:00
parent ee844411e9
commit 40a392599f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=111901
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -554,11 +554,11 @@ case "${RERUN}" in
;; # End of the "RERUN" test
esac
# We really don't want to have to deal with these files, since
# master.passwd is the real file that should be compared, then
# the user should run pwd_mkdb if necessary.
# We really don't want to have to deal with files like login.conf.db, pwd.db,
# or spwd.db. Instead, we want to compare the text versions, and run *_mkdb.
# Prompt the user to do so below, as needed.
#
rm -f ${TEMPROOT}/etc/spwd.db ${TEMPROOT}/etc/passwd ${TEMPROOT}/etc/pwd.db
rm -f ${TEMPROOT}/etc/*.db
# We only need to compare things like freebsd.cf once
find ${TEMPROOT}/usr/obj -type f -delete 2>/dev/null