Re: [gentoo-user] emerge default config

2015-01-25 Thread Rich Freeman
On Sun, Jan 25, 2015 at 9:57 AM, cov...@ccs.covici.com wrote: Marc Joliet mar...@gmx.de wrote: The man page to cfg-update says that it needs diff3 for the automatic three-way merge (STAGE2), which is part of diffutils. Interestingly, cfg-update does not depend on diffutils, so maybe you

Re: [gentoo-user] emerge default config

2015-01-25 Thread covici
Marc Joliet mar...@gmx.de wrote: Am Fri, 23 Jan 2015 21:30:07 -0500 schrieb Rich Freeman ri...@gentoo.org: On Fri, Jan 23, 2015 at 7:12 PM, cov...@ccs.covici.com wrote: On Fri, Jan 23, 2015 at 5:45 PM, shawn wilson ag4ve...@gmail.com wrote: Is there a way to have default config

Re: [gentoo-user] emerge default config

2015-01-25 Thread Marc Joliet
Am Fri, 23 Jan 2015 21:30:07 -0500 schrieb Rich Freeman ri...@gentoo.org: On Fri, Jan 23, 2015 at 7:12 PM, cov...@ccs.covici.com wrote: On Fri, Jan 23, 2015 at 5:45 PM, shawn wilson ag4ve...@gmail.com wrote: Is there a way to have default config lines that emerge updates won't touch?

Re: [gentoo-user] emerge default config

2015-01-24 Thread Róbert Čerňanský
On Fri, 23 Jan 2015 18:30:52 -0500 Rich Freeman ri...@gentoo.org wrote: On Fri, Jan 23, 2015 at 5:45 PM, shawn wilson ag4ve...@gmail.com wrote: Is there a way to have default config lines that emerge updates won't touch? I'd be interested in hearing about alternatives, but I switched

Re: [gentoo-user] emerge default config

2015-01-23 Thread Rich Freeman
On Fri, Jan 23, 2015 at 5:45 PM, shawn wilson ag4ve...@gmail.com wrote: Is there a way to have default config lines that emerge updates won't touch? I'd be interested in hearing about alternatives, but I switched to cfg-update from dispatch-conf and such because it does automatic 3-way merging.

Re: [gentoo-user] emerge default config

2015-01-23 Thread shawn wilson
On Fri, Jan 23, 2015 at 7:12 PM, cov...@ccs.covici.com wrote: Rich Freeman ri...@gentoo.org wrote: On Fri, Jan 23, 2015 at 5:45 PM, shawn wilson ag4ve...@gmail.com wrote: Is there a way to have default config lines that emerge updates won't touch? I'd be interested in hearing about

Re: [gentoo-user] emerge default config

2015-01-23 Thread covici
Rich Freeman ri...@gentoo.org wrote: On Fri, Jan 23, 2015 at 5:45 PM, shawn wilson ag4ve...@gmail.com wrote: Is there a way to have default config lines that emerge updates won't touch? I'd be interested in hearing about alternatives, but I switched to cfg-update from dispatch-conf and

Re: [gentoo-user] emerge default config

2015-01-23 Thread Rich Freeman
On Fri, Jan 23, 2015 at 7:12 PM, cov...@ccs.covici.com wrote: On Fri, Jan 23, 2015 at 5:45 PM, shawn wilson ag4ve...@gmail.com wrote: Is there a way to have default config lines that emerge updates won't touch? I'd be interested in hearing about alternatives, but I switched to

Re: [gentoo-user] emerge default config

2015-01-23 Thread covici
Rich Freeman ri...@gentoo.org wrote: On Fri, Jan 23, 2015 at 7:12 PM, cov...@ccs.covici.com wrote: On Fri, Jan 23, 2015 at 5:45 PM, shawn wilson ag4ve...@gmail.com wrote: Is there a way to have default config lines that emerge updates won't touch? I'd be interested in hearing

Re: [gentoo-user] emerge default config

2015-01-23 Thread Tomas Mozes
On 2015-01-23 23:45, shawn wilson wrote: Is there a way to have default config lines that emerge updates won't touch? For instance, my /etc/ssh/sshd_config differs from the default in some places. I know this and upstream shows me the same diffs in that file over and over again. But maybe