From owner-freebsd-stable Sat Jan 13 5:12:35 2001 Delivered-To: freebsd-stable@freebsd.org Received: from level3.dynacom.net (level3.dynacom.net [206.107.213.213]) by hub.freebsd.org (Postfix) with SMTP id 883F437B400 for ; Sat, 13 Jan 2001 05:12:17 -0800 (PST) Received: (qmail 15253 invoked by uid 0); 13 Jan 2001 13:12:16 -0000 Received: from unknown (HELO urx.com) (206.159.132.160) by mail.urx.com with SMTP; 13 Jan 2001 13:12:16 -0000 Message-ID: <3A605430.5D32DB56@urx.com> Date: Sat, 13 Jan 2001 05:12:16 -0800 From: Kent Stewart Reply-To: kstewart@urx.com Organization: Dynacom X-Mailer: Mozilla 4.76 [en] (Windows NT 5.0; U) X-Accept-Language: en MIME-Version: 1.0 To: whisky Cc: freebsd-stable@freebsd.org Subject: Re: Mergemaster References: <014301c07d5c$1fc9dc80$0100000a@win2k> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG whisky wrote: > > How does one use mergemaster correctly after a make installworld of 4.2-R to > 4.x-S Very, very carefully. It will try to change all of the configuration files that have been updated. If you have added local mods, they disappear. I don't let it touch my firewall rules, ppp.conf, passwd, or groups. It will also try to change files root uses but I don't let it. I check when it changes my dot."*" files. If I have added local aliases or paths, I don't want them removed. The choices provided by mergemaster on them is always i(nstall new), d(elete new), or m(erge). On the special files, I usually press the enter key, which is none of the above and do them individually. Then, I go through after everything is done and merged what was important out of the files in /var/tmp/temproot/etc. If you include the header information at the top, it ignore that file in the future until the it is modified by the maintainer. The rest of the files I usually add the new mods. It is really convient to do this all from a second computer. Being able to do that depends on your system. You could also do it from x-windows but that really uses a lot of memory that would usually be more beneficial to the compilers. I just happen to set my system up such that I can do an installworld in multi-user mode. Not everyone can do this. It is discussed in /usr/src/UPDATING. The advantage is that it lets me telnet or ssh in and do everything from several sessions. When I get through, I reboot from the console. Kent > > Help is much appreciated > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-stable" in the body of the message -- Kent Stewart Richland, WA mailto:kbstew99@hotmail.com http://kstewart.urx.com/kstewart/index.html FreeBSD News http://daily.daemonnews.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message