Re: mergemaster users, check login.conf

2007-05-26 Thread Tobias Ulmer
On Wed, May 23, 2007 at 06:31:31PM +, Christian Weisgerber wrote: > People who use ports/sysutils/mergemaster to update /etc might want > to manually check their /etc/login.conf: > > # cd /usr/src/etc > # make DESTDIR=/var/tmp/temproot distribution-etc-root-var > # diff -u /etc/login.conf /var

Re: mergemaster

2006-02-16 Thread Antoine Jacoutot
Selon Christian Weisgerber <[EMAIL PROTECTED]>: > I've shelved this for 3.9 since I haven't gotten around to evaluating > mergeslave yet. Great, thanks. I'm happy this was not a rejected idea :-) -- Antoine

Re: mergemaster

2006-02-16 Thread Christian Weisgerber
Antoine Jacoutot <[EMAIL PROTECTED]> wrote: > Any news about the possible inclusion of mergemaster/mergeslave into the base > system ? I've shelved this for 3.9 since I haven't gotten around to evaluating mergeslave yet. -- Christian "naddy" Weisgerber [EMAIL PROTECTED]

Re: mergemaster

2006-02-16 Thread Antoine Jacoutot
> Christian Weisgerber wrote: > > The questions is, what *do* people use for updating /etc? Hi. Any news about the possible inclusion of mergemaster/mergeslave into the base system ? Thanks! -- Antoine

Re: mergemaster

2006-01-12 Thread Alexander Hall
Christian Weisgerber wrote: The questions is, what *do* people use for updating /etc? I use a (originally) small shell script that, if all parts are available works as follows: 1. Back up stuff 2. Extract the last etcXX.tgz to some temporary directory ("last") 3. Extract the new etcXX.tgz to

Re: mergemaster

2006-01-12 Thread Jacob Meuser
On Sun, Jan 08, 2006 at 02:46:51PM +, Christian Weisgerber wrote: > Han Boetes <[EMAIL PROTECTED]> wrote: > > > > > Since gdiff isn't needed anymore, do you think mergemaster could be > > > > integrated in the base system one of those days, > > > > > > I'm considering this. > > > > Are you c

Re: mergemaster

2006-01-11 Thread Andrew Dalgleish
On Sun, Jan 08, 2006 at 02:46:51PM +, Christian Weisgerber wrote: [snip] > > The questions is, what *do* people use for updating /etc? I use a cvs vendor branch. Regards, Andrew Dalgleish

Re: mergemaster

2006-01-09 Thread Craig Skinner
On Sun, Jan 08, 2006 at 04:18:32PM +0100, Jonathan Weiss wrote: > > I would really appreciate having mergemaster in the base system. > mergemaster or mergeslave in base would be fantastic as I ONLY use binaries. At the moment I have a file server that runs rsnapshot /etc on all boxes, so I go

Re: mergemaster

2006-01-08 Thread Andrew Daugherity
On 1/8/06, Jonathan Weiss <[EMAIL PROTECTED]> wrote: > I would really appreciate having mergemaster in the base system. > Or at least a mention of it in the upgrade FAQ [ http://www.openbsd.org/faq/upgrade38.html ]. Even just something like "Some people find the sysutils/mergemaster port useful f

Re: mergemaster

2006-01-08 Thread Jonathan Weiss
Christian Weisgerber wrote: No, if only for the fact that I wasn't aware of its existence until you mentioned it just now. The questions is, what *do* people use for updating /etc? I've been using mergemaster for several years now, it's an essential tool for me. But then again, I'm perfectly

Re: mergemaster

2006-01-08 Thread Ingo Schwarze
Christian Weisgerber wrote on Sun, Jan 08, 2006 at 02:46:51PM +: > The questions is, what *do* people use for updating /etc? Long ago (2.x): diff, mv, and cp. For a few years: mergemaster. For 3.6 -> 3.7 -> 3.8: mergeslave. I do confirm Han's statement that using mergeslave instead of mergem

Re: mergemaster

2006-01-08 Thread Han Boetes
Christian Weisgerber wrote: > Han Boetes <[EMAIL PROTECTED]> wrote: > > Are you considering mergeslave as well? > > No, if only for the fact that I wasn't aware of its existence > until you mentioned it just now. Well it's much faster and easier to use than mergemaster. Do give it a try. # Han

Re: mergemaster

2006-01-08 Thread Antoine Jacoutot
On Sun, 8 Jan 2006, Christian Weisgerber wrote: The questions is, what *do* people use for updating /etc? I've been using mergemaster for several years now, it's an essential tool for me. But then again, I'm perfectly happy to just dump it into ~/bin on my boxes if there's no general interest.

Re: mergemaster

2006-01-08 Thread Christian Weisgerber
Han Boetes <[EMAIL PROTECTED]> wrote: > > > Since gdiff isn't needed anymore, do you think mergemaster could be > > > integrated in the base system one of those days, > > > > I'm considering this. > > Are you considering mergeslave as well? No, if only for the fact that I wasn't aware of its ex

Re: mergemaster (was: Re: CVS: cvs.openbsd.org: ports)

2005-12-27 Thread Han Boetes
Christian Weisgerber wrote: > Over on ports-changes, Antoine Jacoutot <[EMAIL PROTECTED]> wrote: > > Since gdiff isn't needed anymore, do you think mergemaster could be > > integrated in the base system one of those days, > > I'm considering this. Are you considering mergeslave as well? # Han