From owner-freebsd-stable@FreeBSD.ORG Mon Oct 27 19:44:25 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 E4E3B1065670 for ; Mon, 27 Oct 2008 19:44:25 +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 5C8C88FC1E for ; Mon, 27 Oct 2008 19:44:25 +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 m9RJiMre031778; Mon, 27 Oct 2008 20:44:23 +0100 (CET) (envelope-from oliver.fromme@secnetix.de) Received: (from olli@localhost) by lurza.secnetix.de (8.14.3/8.14.3/Submit) id m9RJiMmo031777; Mon, 27 Oct 2008 20:44:22 +0100 (CET) (envelope-from olli) Date: Mon, 27 Oct 2008 20:44:22 +0100 (CET) Message-Id: <200810271944.m9RJiMmo031777@lurza.secnetix.de> From: Oliver Fromme To: freebsd-stable@FreeBSD.ORG 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]); Mon, 27 Oct 2008 20:44:24 +0100 (CET) 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: Mon, 27 Oct 2008 19:44:26 -0000 martinko wrote: > Oliver Fromme wrote: > I'd like a more general purpose utility, be it mergemaster or sth else. > I like the way mergemaster works but I'd like to use it not only for > /etc (after make) -- I'd like to point it to my backup directory which > doesn't contain all of /etc and compare the files it finds with those in > /etc. That can be done like this, assuming /root/etcbak is your backup directory, and also assuming that /usr/src is of the same date as /etc (if not, use cvsup or csup to bring it to the same date). # mkdir -p /tmp/newroot # find /etc /root/etcbak | cpio -dump /tmp/newroot # cd /root/etcbak # mergemaster -D /tmp/newroot The result of the merge will be in /tmp/newroot/etc. > Or point it to arbitrary 2 directories and compare their files. You can compare arbitrary directories with diff -r. 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 "Perl will consistently give you what you want, unless what you want is consistency." -- Larry Wall