diff options
| author | dougb <dougb@FreeBSD.org> | 2003-03-05 08:20:55 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2003-03-05 08:20:55 +0000 |
| commit | 4585c05036656e7d4addfa482384fdecb137931f (patch) | |
| tree | 10d5e28ec3a5ee467e72ca013a44484ff1d039b1 | |
| parent | 3e6967b30c77612065b18b9a17cef125d208d534 (diff) | |
| download | FreeBSD-src-4585c05036656e7d4addfa482384fdecb137931f.zip FreeBSD-src-4585c05036656e7d4addfa482384fdecb137931f.tar.gz | |
Better handle the recent (desirable) change to create login.conf.db at
install time, and make sure to catch any future .db files as well.
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 7e415f9..131ccea 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -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 |
