Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 Nov 2001 09:41:00 -0500 (EST)
From:      doug <doug@safeport.com>
To:        freebsd-questions@freebsd.org
Subject:   Re: margermaste
Message-ID:  <Pine.BSF.3.96.1011127093159.50019E-100000@fledge.watson.org>
In-Reply-To: <011e01c1772a$aca34ec0$6d36120a@comsys.ntukpi.kiev.ua>

next in thread | previous in thread | raw e-mail | index | archive | help
I like: script merge.log mergemaster -ai

You get a log of what was done. Depending on how often you upgrade this
still leaves a lot of files that (I) have not changed. I have never had
this overlay any of my local changes. 

My next step is to identify the things left that can be safely moved (with
a shell script) and use mergemaster -r to handle the rest.



On Tue, 27 Nov 2001, Andrey Simonenko wrote:

> 
> ----- Original Message ----- 
> From: budsz <budsan02@bdg.centrin.net.id>
> Newsgroups: lucky.freebsd.questions
> Sent: Tuesday, November 27, 2001 1:52 PM
> Subject: margermaster
> 
> 
> > I've following the instruction in
> > http://www.nothing-going-on.demon.co.uk/FreeBSD/make-world/make-world.html
> > but I didn't find instruction for margermaster, it's needed...? i just
> > copy in /var/tmp/root/etc to /etc (ofcource after command 
> > # make DESTDIR=/var/tmp/root distrib-dirs distribution) it's true...?
> > and if I do #make world it's same with #make builtworld & #make
> > installworld ?
> > 
> 
> I usualy call "mergemaster -a" after "make installworld", then
> I run Perl-script, which removes emty directories from /var/tmp/temproot.
> After this I check differences between /etc and /var/tmp/temproot/etc
> (I patched some file in /etc, so I have to manualy chek difference).
> 
> I don't think that it's good to just to copy /var/tmp/temproot/etc to /etc,
> because you know nothing about changes in /etc scripts and configuration
> files.
> 
> 
> 
> 
> 
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-questions" in the body of the message
> 


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-questions" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.3.96.1011127093159.50019E-100000>