Date: Thu, 9 Nov 2000 23:10:53 +0000 From: Mark Ovens <marko@freebsd.org> To: Gerry Freymann <freymann@marlo.eagle.ca> Cc: stable@freebsd.org Subject: Re: Questions after doing a cvsup Message-ID: <20001109231053.B253@parish> In-Reply-To: <Pine.BSF.3.96.1001109174015.7296B-100000@marlo.eagle.ca>; from freymann@marlo.eagle.ca on Thu, Nov 09, 2000 at 05:49:49PM -0500 References: <14859.1104.90246.424231@moriarity.grauel.com> <Pine.BSF.3.96.1001109174015.7296B-100000@marlo.eagle.ca>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Nov 09, 2000 at 05:49:49PM -0500, Gerry Freymann wrote: > I had originally installed Freebsd 4.1.1-stable. > > I thought it would be a good idea to cvsup to the latest, so I used the > instructions at http://www.mostgraveconcern.com/freebsd to guide me > through my task. > > As always, there were differences in the instructions and what really > happened. > > I did: > > -buildworld > -buildkernel > -installkernel > (then in single user mode) > cd /usr/src > make installworld > > Update /etc > cp -Rp /etc /etc.old > /usr/sbin/mergemaster -v > > cd /dev > ./MAKEDEV all > > Update stand > cd /usr/src/release/sysinstall > make clean > make all install > > Great eh! When I rebooted, I saw the new kernel loading, but the hostname > was forgotten and no network stuff loaded. > > Is there anything that talks about "mergemaster?" I have to admit I didn't > really know wtf was going on there. > If you don't know what it's for, don't f*** with it :) Seriously, when you run mergemaster you have to be *very* careful because it is updating your config files in /etc (at least you had the good sense to backup /etc first). Basically it diff(1)s /etc with the new /etc (in /var/temproot) and, if a file is unchanged it ignores it, if it is a new file it installs it (in /etc) and if it is different to the existing one it runs diff(1) | more and lets you study the differences. If it finds diffs in files that you don't use (rc.pccard for example) you can just let it install the new version. If it's a file that your system does use (typically passwd, group, printcap for example) then you need to study the diffs carefully. If you are sure that the *only* diffs are things that you have added (e.g. your local users in passwd) then discard the new file and retain the original. What you need to be aware of is that occasionally new system users (daemon, operator etc) or groups get added which will almost certainly be needed by the new system. In this case you should leave the file to merge by hand later. HTH > I eventually decided just to rename /etc to /etc.new and my /etc.old back > to /etc and reboot. Voila! My machine knows who it is, all the network > stuff loads and the other boot up stuff in /usr/local/etc/rc.d loads. > > Confusing to this first-timer. > > Now when I go into /stand/sysinstall, do post config, and opt to install > premade freebsd packages, when I select an FTP server, it says it doesn't > have the files for 4.2-Beta! even ftp.freebsd.org! ug! > > Does this mean I should stick to using the files on my hard drive now? A > pkg_version -v shows there are some items that can be updated. > > Tips? Suggestions? I have another machine to do the same things with next > week. Would like to head into it slightly smarter ;-) > > Thanks. > > -Gerry > > > > > > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-stable" in the body of the message -- 4.4 - The number of the Beastie ________________________________________________________________ 51.44°N FreeBSD - The Power To Serve http://www.freebsd.org 2.057°W My Webpage http://ukug.uk.freebsd.org/~mark mailto:marko@freebsd.org http://www.radan.com 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?20001109231053.B253>