Re: r1.322 of src/Makefile.inc1
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 protectionIndex: 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 - 1.41
+++ mergemaster.sh 5 Mar 2003 08:20:55 - 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
Re: r1.322 of src/Makefile.inc1
On Tue, Mar 04, 2003 at 10:35:39PM -0800, Doug Barton wrote: > On Wed, 5 Mar 2003, John Hay wrote: > > > On Wed, Mar 05, 2003 at 12:07:01AM +0200, Ruslan Ermilov wrote: > > > On Tue, Mar 04, 2003 at 04:50:37PM +, Ceri Davies wrote: > > > > > > > > Was this behaviour from mergemaster intended ? > > > > > > > > > > > > *** 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 > > > > > > > Sorry, I don't use mergemaster(8) so I can't say. Doug was > > > all for this change, so he may be of some help here. > > > > I think it is because previously login.conf.db was optional. Now it > > is kind of forced on you because all installations will have it. So > > either you have to remember to delete it or remember to update it > > after login.conf has changed. > > Correct, but this is not a bad thing. :) mergemaster already prompts you > to rebuild it when it's updated, so this is not rocket science. Well I did not mean it was necessarily bad, but it is a change and might be ok for -current. I'm just not so sure it is good for -stable too. Say for instance someone is used to just editing /etc/login.conf and have it take effect, so if he installs 4.8 and just edit /etc/login.conf, it won't take effect as it did before. > > FWIW I never used login.conf.db on > > any of my machines because the system can read login.conf already > > and I don't maintain high login rate machines. > > Are you sure that login time is the only time that this is read? :) Well, no. :-) John -- John Hay -- [EMAIL PROTECTED] / [EMAIL PROTECTED] To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-stable" in the body of the message
Re: r1.322 of src/Makefile.inc1
On Wed, 5 Mar 2003, John Hay wrote: > On Wed, Mar 05, 2003 at 12:07:01AM +0200, Ruslan Ermilov wrote: > > On Tue, Mar 04, 2003 at 04:50:37PM +, Ceri Davies wrote: > > > > > > Was this behaviour from mergemaster intended ? > > > > > > > > > *** 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 > > > > > Sorry, I don't use mergemaster(8) so I can't say. Doug was > > all for this change, so he may be of some help here. > > I think it is because previously login.conf.db was optional. Now it > is kind of forced on you because all installations will have it. So > either you have to remember to delete it or remember to update it > after login.conf has changed. Correct, but this is not a bad thing. :) mergemaster already prompts you to rebuild it when it's updated, so this is not rocket science. > FWIW I never used login.conf.db on > any of my machines because the system can read login.conf already > and I don't maintain high login rate machines. Are you sure that login time is the only time that this is read? :) -- This .signature sanitized for your protection To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-stable" in the body of the message
Re: r1.322 of src/Makefile.inc1
On Wed, Mar 05, 2003 at 12:07:01AM +0200, Ruslan Ermilov wrote: > On Tue, Mar 04, 2003 at 04:50:37PM +, Ceri Davies wrote: > > > > Was this behaviour from mergemaster intended ? > > > > > > *** 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 > > > Sorry, I don't use mergemaster(8) so I can't say. Doug was > all for this change, so he may be of some help here. I think it is because previously login.conf.db was optional. Now it is kind of forced on you because all installations will have it. So either you have to remember to delete it or remember to update it after login.conf has changed. FWIW I never used login.conf.db on any of my machines because the system can read login.conf already and I don't maintain high login rate machines. John -- John Hay -- [EMAIL PROTECTED] / [EMAIL PROTECTED] To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-stable" in the body of the message
