Date: Mon, 23 Sep 1996 17:11:05 -0700 From: John Polstra <jdp@polstra.com> To: Warner Losh <imp@village.org> Cc: current@freebsd.org Subject: Re: Upgrading rc files + CTM outage? Message-ID: <199609240011.RAA13513@austin.polstra.com> In-Reply-To: <199609220646.AAA00334@rover.village.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> After fighting a little with the upgrade procedure, and finally
> taking the time to upgrade the rc files, I was wondering if there
> was a painless way to merge in the current /etc/sysconfig file one
> might have with the newer ones that defines more things.
"cvs update" works pretty well for this sort of thing. First,
figure out which version of /etc/sysconfig you started with, by
doing "ident /etc/sysconfig". For concreteness, let's say it was
version 1.40. Get into an empty working directory, and check out
that version:
mkdir work
cd work
cvs co -d . -r 1.40 src/etc/sysconfig
Now copy your real (locally-modified) file on top of that:
cp /etc/sysconfig .
Merge in the changes between your starting version and the current
one:
cvs update -A
CVS will perform the merge, and will warn you if there are any
conflicts. You can use "cvs diff" to see your local modifications,
as applied to the current version of the file. Edit the file and
get rid of any conflicts. When you are satisfied with the result,
copy the file back into /etc.
For a single file, "diff3 -m" may be an easier way to do this.
John
--
John Polstra jdp@polstra.com
John D. Polstra & Co., Inc. Seattle, Washington USA
"Self-knowledge is always bad news." -- John Barth
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199609240011.RAA13513>