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
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
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]
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
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
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
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
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
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
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
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
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
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
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
14 matches
Mail list logo
