From owner-freebsd-questions Sat Oct 26 17:31:19 2002 Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8DC9537B401 for ; Sat, 26 Oct 2002 17:31:18 -0700 (PDT) Received: from mta6.snfc21.pbi.net (mta6.snfc21.pbi.net [206.13.28.240]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49F8043E4A for ; Sat, 26 Oct 2002 17:31:18 -0700 (PDT) (envelope-from mbsd@pacbell.net) Received: from atlas ([64.165.199.240]) by mta6.snfc21.pbi.net (iPlanet Messaging Server 5.1 (built May 7 2001)) with ESMTP id <0H4M00EK06S5PF@mta6.snfc21.pbi.net> for questions@freebsd.org; Sat, 26 Oct 2002 17:31:18 -0700 (PDT) Date: Sat, 26 Oct 2002 17:31:17 -0700 (PDT) From: =?ISO-8859-1?Q?Mikko_Ty=F6l=E4j=E4rvi?= Subject: Re: mergemaster question In-reply-to: <20021026195056.A11787@skytrackercanada.com> X-X-Sender: mikko@atlas.home To: David Banning Cc: questions@freebsd.org Message-id: <20021026172548.U313-100000@atlas.home> MIME-version: 1.0 Content-type: TEXT/PLAIN; charset=US-ASCII Content-transfer-encoding: 7BIT 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 On Sat, 26 Oct 2002, David Banning wrote: > I am just in the process of upgrading from 4.5S to 4.7 and I will > be running mergemaster. > > One thing I notice using mergemaster is that it seems to take such a long > time. Is there a quicker way? It wants to replace alot of files, > and that's OK for me 95% of the time. > Only a few I want to keep or merge. > > Am I missing something, or is it just a part of upgrading that you must > decide, file by file which will be modified or replaced? There will only be a lot of files to update if it has been a long time since you last rebuilt everything and ran mergemaster. You can reduce the number of files to check by copying files you know you have not modified before running mergemaster, e.g.: cp /usr/src/etc/mtree/* /etc/mtree cp /usr/src/etc/defaults/* /etc/defaults cp /usr/src/etc/rc /etc cp /usr/src/etc/rc.{diskless*,i386,network*} /etc I think there are hooks in mergemaster that allow you to script some of this stuff, but I've never gotten around to use them. $.02, /Mikko To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message