[olug] RE: Gentoo vs Red Hat (was Red Hat network and update removal)
Terry Bradshaw
angrypuppy at tconl.com
Wed Oct 8 03:42:34 UTC 2003
On Fri, 2003-09-26 at 08:05, Tim Bornholtz wrote:
> I completely screwed up my /etc directory the first time I ran
> etc-update. Be a bit careful. One of the things that I found on the
> gentoo forums was to switch plain old diff with a graphical one.
>
> Modify your /etc/etc-update.conf like this (the first line is the
> default and the second line is what I'm using):
>
> #pager="less"
> pager=""
>
>
> #diff_command="diff -uN %file1 %file2"
> diff_command="gtkdiff %file1 %file2"
>
> #merge_command="sdiff -s -o %merged %orig %new"
> merge_command="gtkdiff -o %merged %orig %new"
>
>
> Of course, you'll have to emerge gtkdiff for this to work :-)
>
> Good luck and welgome to Gentoo!
>
> Tim
>
By the way, I used these instructions, and it worked nicely. Especially
with so many modifications I've made to fstab, this made it clearer what
was being pulled from where and made it easier to accept lines from
either source.
Thanks again.
Terry
More information about the OLUG
mailing list