From owner-freebsd-stable@FreeBSD.ORG Tue Oct 21 13:50:03 2008 Return-Path: Delivered-To: freebsd-stable@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 734751065671 for ; Tue, 21 Oct 2008 13:50:03 +0000 (UTC) (envelope-from olli@lurza.secnetix.de) Received: from lurza.secnetix.de (unknown [IPv6:2a01:170:102f::2]) by mx1.freebsd.org (Postfix) with ESMTP id E4EBC8FC12 for ; Tue, 21 Oct 2008 13:50:02 +0000 (UTC) (envelope-from olli@lurza.secnetix.de) Received: from lurza.secnetix.de (localhost [127.0.0.1]) by lurza.secnetix.de (8.14.3/8.14.3) with ESMTP id m9LDo0LB077771; Tue, 21 Oct 2008 15:50:00 +0200 (CEST) (envelope-from oliver.fromme@secnetix.de) Received: (from olli@localhost) by lurza.secnetix.de (8.14.3/8.14.3/Submit) id m9LDo0Js077761; Tue, 21 Oct 2008 15:50:00 +0200 (CEST) (envelope-from olli) Date: Tue, 21 Oct 2008 15:50:00 +0200 (CEST) Message-Id: <200810211350.m9LDo0Js077761@lurza.secnetix.de> From: Oliver Fromme To: freebsd-stable@FreeBSD.ORG, gamato@users.sf.net In-Reply-To: X-Newsgroups: list.freebsd-stable User-Agent: tin/1.8.3-20070201 ("Scotasay") (UNIX) (FreeBSD/6.4-PRERELEASE-20080904 (i386)) MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.1.2 (lurza.secnetix.de [127.0.0.1]); Tue, 21 Oct 2008 15:50:01 +0200 (CEST) Cc: Subject: Re: easy way to upgrade from 6.3 to 7.1 (including port packages) X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-stable@FreeBSD.ORG, gamato@users.sf.net List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Oct 2008 13:50:03 -0000 martinko wrote: > 1) I wonder if I could use mergemaster to compare 2 directories and > merge differencies as neccessary. To explain: I have all config files I > touch saved with full path somewhere in /root. And therefore I'd like > mergemaster or some other tool to compare all files in my backup > directory with newly installed (config) files. You can use mergemaster against any directory, not just /etc. This is especially useful when perforing a binary update, a cross update or similar things. For example, suppose you have a freshly installed system (including /usr/src) with a virgin /etc directory, and you've got a copy of an old etc directory (with local modifications) in /root/etc.old. Then you can do this: # mergemaster -D /root/etc.old And all new things will be merged into /root/etc.old. When you're done, simply copy /root/etc.old to /etc and reboot. (You might want to keep a copy of the original contents of the directory, just to be on the safe side.) Best regards Oliver -- Oliver Fromme, secnetix GmbH & Co. KG, Marktplatz 29, 85567 Grafing b. M. Handelsregister: Registergericht Muenchen, HRA 74606, Geschäftsfuehrung: secnetix Verwaltungsgesellsch. mbH, Handelsregister: Registergericht Mün- chen, HRB 125758, Geschäftsführer: Maik Bachmann, Olaf Erb, Ralf Gebhart FreeBSD-Dienstleistungen, -Produkte und mehr: http://www.secnetix.de/bsd "Clear perl code is better than unclear awk code; but NOTHING comes close to unclear perl code" (taken from comp.lang.awk FAQ)