Date: Wed, 5 Mar 2003 00:29:52 -0800 (PST) From: Doug Barton <DougB@FreeBSD.org> To: Ceri Davies <setantae@submonkey.net> Cc: ru@FreeBSD.org, stable@FreeBSD.org, re@freebsd.org Subject: Re: r1.322 of src/Makefile.inc1 Message-ID: <20030305002450.V18288@znfgre.tberna.bet> In-Reply-To: <20030304165037.GA7463@submonkey.net> References: <20030304165037.GA7463@submonkey.net>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Tue, 4 Mar 2003, Ceri Davies wrote:
>
> Was this behaviour from mergemaster intended ?
Depends on what you mean by "behaviour from mergemaster." :) It relies
entirely on src/etc/Makefile to "know" (or more precisely, to avoid
knowledge of) what files to deal with.
I just committed the attached patch to fix this on -current. Release
engineers, I'd like to MFC it before 4.8 if possible. The only .db files
that exist currently in TEMPROOT are the password files that were already
being deleted, and the newly added login.conf.db; so there won't be any
actual difference in user experience.
Doug
> *** Displaying differences between ./etc/login.conf.db and installed version:
>
> Binary files /etc/login.conf.db and ./etc/login.conf.db differ
>
> Use 'd' to delete the temporary ./etc/login.conf.db
> Use 'i' to install the temporary ./etc/login.conf.db
> Use 'm' to merge the temporary and installed versions
> Use 'v' to view the diff results again
>
> Default is to leave the temporary file to deal with by hand
>
> How should I deal with this? [Leave it for later] d
>
> *** Deleting ./etc/login.conf.db
>
>
> Ceri
>
>
--
This .signature sanitized for your protection
[-- Attachment #2 --]
Index: mergemaster.sh
===================================================================
RCS file: /home/ncvs/src/usr.sbin/mergemaster/mergemaster.sh,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mergemaster.sh 5 Feb 2003 11:09:21 -0000 1.41
+++ mergemaster.sh 5 Mar 2003 08:20:55 -0000 1.42
@@ -554,11 +554,11 @@
;; # 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030305002450.V18288>