From owner-freebsd-questions Tue Nov 27 6:41:21 2001 Delivered-To: freebsd-questions@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id 2BA6837B405 for ; Tue, 27 Nov 2001 06:41:13 -0800 (PST) Received: from localhost (doug@localhost) by fledge.watson.org (8.11.6/8.11.5) with SMTP id fAREf1j10951 for ; Tue, 27 Nov 2001 09:41:01 -0500 (EST) (envelope-from doug@safeport.com) X-Authentication-Warning: fledge.watson.org: doug owned process doing -bs Date: Tue, 27 Nov 2001 09:41:00 -0500 (EST) From: doug X-Sender: doug@fledge.watson.org To: freebsd-questions@freebsd.org Subject: Re: margermaste In-Reply-To: <011e01c1772a$aca34ec0$6d36120a@comsys.ntukpi.kiev.ua> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG 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 > 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