Re: mergemaster users, check login.conf
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/tmp/temproot/etc/login.conf > [... compare, edit ...] > # rm -r /var/tmp/temproot > > A while back, the default filedescriptor limit was bumped from 64 > to 128. The login.conf file is generated from a template and that > change happened in mklogin.conf, not login.conf.in. However, > login.conf only sports the $OpenBSD: login.conf.in,v $ line. No > difference there, so mergemaster skips the comparison, missing out > on the change. > > (This is of particular importance to Firefox users, since FF tends > to run out of file descriptors with the old limit, causing all sorts > of odd problems.) > -- > Christian "naddy" Weisgerber [EMAIL PROTECTED] > > Thanks for the instructions. Same old question again: Will mergemaster be in 4.2? ;-] Tobias
mergemaster users, check login.conf
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/tmp/temproot/etc/login.conf [... compare, edit ...] # rm -r /var/tmp/temproot A while back, the default filedescriptor limit was bumped from 64 to 128. The login.conf file is generated from a template and that change happened in mklogin.conf, not login.conf.in. However, login.conf only sports the $OpenBSD: login.conf.in,v $ line. No difference there, so mergemaster skips the comparison, missing out on the change. (This is of particular importance to Firefox users, since FF tends to run out of file descriptors with the old limit, causing all sorts of odd problems.) -- Christian "naddy" Weisgerber [EMAIL PROTECTED]
Re: mergemaster
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
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
> 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
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 some temporary directory ("new")
4. Remove files from "new" if they are unmodified since "last"
(This removes most files, at least for snapshot upgrading)
5. Install files from "new" where the currently installed file
matches "last" (overwrites non-modified files)
6. Use mergemaster for the rest of "new" (usually none :)
(Seems to) work like a charm for me. Thus, I depend on mergemaster for
this, although I have not used (or tested) mergeslave.
My 2 Swedish vre. (0.02 kronor)
/Alexander
Re: mergemaster
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 considering mergeslave as well? > > 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? cd ~/tmp/newroot tar zxpvf /home/OpenBSD/snapshots/sgi/etc38.tgz cd etc diff -ur /etc . | less ! cp -Rp ... /etc q -- <[EMAIL PROTECTED]> > 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. > > -- > Christian "naddy" Weisgerber [EMAIL PROTECTED]
Re: mergemaster
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
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 back though the snaphots after an upgrade. Not the best.
Re: mergemaster
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 for updating /etc; pay particular attention to the -r and -t options in mergemaster(1)." would be nice. I only found out about it through this list, after having done my first upgrade (3.4 -> 3.5) with a rather time-consuming recursive diff of /etc. Needless to say, I was a bit perturbed. "You mean OpenBSD has mergemaster just like FreeBSD and I didn't have to do that long diff perusal?" -Andrew
Re: mergemaster
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 happy to just dump it into ~/bin on my boxes if there's no general interest. I would really appreciate having mergemaster in the base system. Jonathan -- Jonathan Weiss http://blog.innerewut.de
Re: mergemaster
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 mergemaster saves me time. Trying it out probably won't be a waste of time. Cutting mergeslave out of http://www.xs4all.nl/~hanb/software/OpenBSD-binary-upgrade/OpenBSD-binary-upgrade is nearly trivial. -- Ingo Schwarze <[EMAIL PROTECTED]>
Re: mergemaster
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
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. For what it's worth, I too _heavily_ depend on mergemaster to update /etc in my machines. Antoine
Re: mergemaster
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 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 happy to just dump it into ~/bin on my boxes if there's no general interest. -- Christian "naddy" Weisgerber [EMAIL PROTECTED]
Re: mergemaster (was: Re: CVS: cvs.openbsd.org: ports)
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
mergemaster (was: Re: CVS: cvs.openbsd.org: ports)
Over on ports-changes, Antoine Jacoutot <[EMAIL PROTECTED]> wrote: > > Modified files: > > sysutils/mergemaster: Makefile > > sysutils/mergemaster/patches: patch-mergemaster_sh > > > > Log message: > > use system sdiff, drop GNU diff dependency > > 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. -- Christian "naddy" Weisgerber [EMAIL PROTECTED]
