Date: Mon, 29 May 2000 01:18:02 -0400 (EDT) From: Jim Weeks <jim@siteplus.net> To: Szilveszter Adam <sziszi@petra.hos.u-szeged.hu> Cc: freebsd-stable@FreeBSD.ORG Subject: Re: 4.0-RELEASE to 4.0-STABLE upgrade Message-ID: <Pine.BSF.4.21.0005290107500.2478-100000@discover.siteplus.net> In-Reply-To: <20000529062746.B3116@petra.hos.u-szeged.hu>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 29 May 2000, Szilveszter Adam wrote: > > OK, I was caught at this:-) The Handbook is still not updated to reflect > this (although I remembered otherwise) so you should see man page for > mergemaster(8)... it is in the base system for 3.4 for sure (and of course > above) but normally you do not need much documentation for using it: This has been discussed on docs lately. There is a PR in for changes to the Make World page. Mergemaster will be included. > cd to /usr/src/etc and say 'mergemaster'. It will build a temproot > environment under /var/tmp/temproot just as the Handbook does tell you but > you do not have to do it by hand and also it automatically diffs the files > in /etc and the temproot and if it spots any differences, you are given the > choice of installing the new file as is, to keep the old file (eg you should > do this with master.passwd) or to merge the two. It can also leave the file > untouched and then you can finish it up later by hand. After it is finished, > it asks if you want to delete the old temproot. (which you normally want to > do, unless there are files you want to deal with by hand.) > Another note, As was mentioned look over man mergemaster. If you have done a typical install you probably only have 20mb for /var so I suggest you use /usr for the temporary files. As in the following command. mergemaster -t /usr/tmp/root -d which will also add a date to the directory in case you need to save it for some reason. You know better than anyone else which files you have made changes to that should not be changed during upgrade. Just pay attention to the file names and the diffs on the screen before installing new files. Good luck, Jim Weeks -------- A mind is a terrible thing to lose! How I miss mine.. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" 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.0005290107500.2478-100000>