Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Jul 2000 16:21:51 +0100
From:      simond@irrelevant.org
To:        Brian Candler <B.Candler@pobox.com>
Cc:        Neil Blakey-Milner <nbm@mithrandr.moria.org>, freebsd-stable@FreeBSD.ORG
Subject:   Re: mailer.conf zapped
Message-ID:  <20000720162151.E31268@irrelevant.org>
In-Reply-To: <20000720161024.A580@linnet.org>; from B.Candler@pobox.com on Thu, Jul 20, 2000 at 04:10:24PM %2B0100
References:  <20000720154522.A399@linnet.org> <20000720165019.A55399@mithrandr.moria.org> <20000720161024.A580@linnet.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Jul 20, 2000 at 04:10:24PM +0100, Brian Candler wrote:
> On Thu, Jul 20, 2000 at 04:50:19PM +0200, Neil Blakey-Milner wrote:
> > How did you "update" your /etc files?
> 
> Well, firstly I just used the kern/mfsroot floppies and selected 'Upgrade'
> from sysinstall. After rebooting, I did
> 
> cd /etc
> for i in *; do diff -u $i upgrade/$i; done
> 
> then manually did 'mv upgrade/xxx .' where it looked sensible to do so. I
> only did a handful though, so it looked like the upgrade process had done
> most of the work already.
> 
> Since I used 'mv', then everything left in /etc/upgrade/ is a file which I
> _didn't_ manually update:
> 
> # ls /etc/upgrade/
> XF86Config      dm.conf         hosts.lpd       networks        rmt
> adduser.conf    dumpdates       kerberosIV      newsyslog.conf  shells
> aliases         fbtab           localtime       pam.conf        skeykeys
> aliases.db      fstab           login.access    passwd          spwd.db
> amd.map         ftpusers        mail.rc         periodic        syslog.conf
> auth.conf       gettytab        make.conf       ppp             ttys
> crontab         gnats           manpath.config  printcap        uucp
> csh.cshrc       group           master.passwd   profile
> csh.login       host.conf       modems          pwd.db
> csh.logout      hosts           motd            remote
> disktab         hosts.equiv     namedb          resolv.conf
> 
> (in most cases because it was the identical to the file I already had, or in
> the case of group or master.passwd because the only differences were the
> changes I had made myself)
> 
> But it's certainly possible there was some operator error - I am a bit
> jet-lagged at the moment :-)

As far as I remember the recommended way of doing this is to run
mergemaster which makes things a *lot* easier :)

-- 
Simon Dick					simond@irrelevant.org


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?20000720162151.E31268>