Date: Wed, 3 Jul 2002 22:20:28 -0400 (EDT) From: doug@safeport.com To: Doug Barton <DougB@FreeBSD.org> Cc: freebsd-bugs@FreeBSD.org Subject: Re: conf/40102: mergemaster should use the currend working directoryasthe default for -m Message-ID: <Pine.BSF.4.21.0207031853510.2331-100000@pemaquid.safeport.com> In-Reply-To: <3D236A00.12A34A70@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
I told you I would report on the status of /etc/mergemaster.rc and any .mergemaster files later today. I think I indicated I doubted there would be any. Indeed none of the systems have any mergemaster config files, all systems have /usr/sbin pretty early in the path: /sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin /usr/X11R6/bin /root/bin and in all systems the /usr/sbin mergemaster used and matches the correct version. Not sure what you are going for here. I think except for working with an empty /usr/src, mergemaster did what you said it should. I.e., it did not work when an NFS source tree was mounted and mergemaster was run without the '-m' option. With the '-m' it worked. Today I found a laptop with an up to date source tree in /usr/src. That system updated correctly. The only (known) difference between that system and the ones that failed is the 4.6 came from the "right" source tree. So again - nothing out of line. So to summarize: all systems work with the correct mergemaster parameters. A /usr/src tree is not required. The latter should be pretty easy to verify. If not, I have plenty of test cases. The only difference I can remember is that some of the systems did not required running mergemaster -p to add the sendmail uid. Perhaps this was because the systems on the outside of my firewall were updated from the RELENG_4_5 path to pick up various security fixes. I also found a laptop without a /usr/src that updated correctly. The date on /etc/defaults/rc.conf is 'Jun 22 22:54'. If that pre-dates my first email to you (or the date of the PR) then that one just worked. I do not remember going back to correct that system. On Wed, 3 Jul 2002, Doug Barton wrote: > You haven't answered the one thing I actually asked you. Do you have an > /etc/mergemaster.rc file, and/or ~/.mergemasterrc, and if so, what are > the contents. Also, please do 'type mergemaster' and make sure the one > you're using is in /usr/sbin, and then do 'diff -u /usr/sbin/mergemaster > /usr/src/usr.sbin/mergemaseter.sh' (or wherever your source tree is) and > let me know if you see anything different. > > The description that you are providing of what's happening on your > systems leads me strongly to believe that something is very non-standard > at your site. > > Doug > _____ Douglas Denault doug@safeport.com Voice: 301-469-8766 Fax: 301-469-0601 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0207031853510.2331-100000>