Date: Mon, 10 Mar 2003 10:32:48 -0800 From: "Kevin Oberman" <oberman@es.net> To: John Von Essen <essenz@essenz.com> Cc: freebsd-stable@freebsd.org Subject: Re: RELENG_4 Tag... Message-ID: <20030310183248.9AC745D07@ptavv.es.net> In-Reply-To: Your message of "Mon, 10 Mar 2003 09:58:52 PST." <20030310094853.L3006-100000@beck.quonix.net>
next in thread | previous in thread | raw e-mail | index | archive | help
> Date: Mon, 10 Mar 2003 09:58:52 -0800 (PST) > From: John Von Essen <essenz@essenz.com> > Sender: owner-freebsd-stable@FreeBSD.ORG > > I am confused about something. > > I just did a cvsup to RELENG_4. But after building my kernel, it shows > 4.8-RC, not 4.7-STABLE > > Is there a reason for this? Yes. RELENG_4 is now a release candidate for 4.8. This is a part of the normal release cycle for FreeBSD and it results in a large number of questions every time. Once 4.8 is released, RELENG_4 will be re-labeled as 4.8-STABLE until the cycle starts over again for 4.9. 4.7-STABLE no longer exists. > Also, mergemaster completely obliterated my system. Had to copy everything > back from by backup. > > Let me ask this. My feelings with mergemaster are as follows: > > I rather install a completely new /etc, then go in and make changes to the > two or three files that I need to modify, usually just mail/, rc.conf, and > the passwd files. > > I feel safer with this approach then merging files. > > Is there a way to do this with mergemaster? I'm disturbed that mergemaster did ANY damage to your system. Unless you tell it to do dangerous things, it will confirm EVERY change it wants to make and you should determine if the change should be allowed. Typically, any file which has been previously modified for a system needs to be merged and not simply over-written. Files like passwd, group, ssh_config, sshd_config, syslogd, newsyslog, ppp and quite possibly many others will need to be handled with care. Only you can know what files have been customized on your system. You always have the option of merging the files by hand. This is slow and tedious, but it was the only way to do it until mergemaster was written. If you run mergemaster and simply hit <enter> when asked about one of the sensitive files, then you can merge these by hand. R. Kevin Oberman, Network Engineer Energy Sciences Network (ESnet) Ernest O. Lawrence Berkeley National Laboratory (Berkeley Lab) E-mail: oberman@es.net Phone: +1 510 486-8634 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?20030310183248.9AC745D07>