From owner-freebsd-hackers@FreeBSD.ORG Fri Sep 30 14:21:42 2005 Return-Path: X-Original-To: freebsd-hackers@freebsd.org Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 976CF16A41F for ; Fri, 30 Sep 2005 14:21:42 +0000 (GMT) (envelope-from work@ashleymoran.me.uk) Received: from mta08-winn.ispmail.ntl.com (mta08-winn.ispmail.ntl.com [81.103.221.48]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9554F43D5A for ; Fri, 30 Sep 2005 14:21:40 +0000 (GMT) (envelope-from work@ashleymoran.me.uk) Received: from aamta11-winn.ispmail.ntl.com ([81.103.221.35]) by mta08-winn.ispmail.ntl.com with ESMTP id <20050930142139.RTWF10357.mta08-winn.ispmail.ntl.com@aamta11-winn.ispmail.ntl.com> for ; Fri, 30 Sep 2005 15:21:39 +0100 Received: from jigsaw-sbs02.jigsawhq.com ([213.106.224.113]) by aamta11-winn.ispmail.ntl.com with ESMTP id <20050930142139.YBLD1770.aamta11-winn.ispmail.ntl.com@jigsaw-sbs02.jigsawhq.com> for ; Fri, 30 Sep 2005 15:21:39 +0100 Received: from [192.168.0.181] ([192.168.0.181]) by jigsaw-sbs02.jigsawhq.com with Microsoft SMTPSVC(5.0.2195.6713); Fri, 30 Sep 2005 15:20:46 +0100 Message-ID: <433D49BD.4070402@ashleymoran.me.uk> Date: Fri, 30 Sep 2005 15:20:45 +0100 From: Ashley Moran User-Agent: Mozilla Thunderbird 1.0 (Windows/20041206) X-Accept-Language: en-us, en MIME-Version: 1.0 To: freebsd-hackers@freebsd.org References: <20050929224548.GB3035@comp.chem.msu.su> <200509301041.10480.doconnor@gsoft.com.au> <433CFD16.6060200@ashleymoran.me.uk> <200509302327.00537.doconnor@gsoft.com.au> In-Reply-To: <200509302327.00537.doconnor@gsoft.com.au> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 30 Sep 2005 14:20:47.0398 (UTC) FILETIME=[26BE0460:01C5C5CA] Subject: Re: A smarter mergemaster X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Sep 2005 14:21:42 -0000 Daniel O'Connor wrote: > On Friday 30 September 2005 18:23, Ashley Moran wrote: > > It sure would be nice :) > One thing would be to have automatically fetched etc directories so when you > ran it for the first time it would grab a release version of etc for you :) > Hmm.. I'll try and add that if I get some time I think! > Funny you should say that... I had a crack at something similar myself (see below). But I was hampered by the fact that a) I had never used CVS before (we use VSS here but I'm moving it all to SVN), and b) I have no idea how the FreeBSD build process works (I'm a hardcore hacker lol) Unfortunately it seems that config files for the subsystems (eg SSH) are stored separately in the CVS tree and I didn't have time to work out where they live. While we're on the subject, how do you handle the DB files? I don't see any special mention of them in the man pages. When I last etcmerged I glossed over them and haven't had any login problems since. Ashley Here is my effort: #!/bin/sh # takes one argument: name of the tag to get from CVS cd /var/db # clear out any previous files rm -rf etc # fetch new etc files from cvs export CVSROOT=:pserver:anoncvs:anoncvs@anoncvs.fr.FreeBSD.org:/home/ncvs cvs login cvs -QR export -r$1 etc cvs logout cd etc # local adjustment mv etc.i386/ttys . # clear out the other platform-specific files rm -r etc.*