From owner-freebsd-current@FreeBSD.ORG Sun Sep 12 20:07:55 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3768516A4CE for ; Sun, 12 Sep 2004 20:07:55 +0000 (GMT) Received: from nic.ach.sch.gr (nic.sch.gr [194.63.238.4]) by mx1.FreeBSD.org (Postfix) with ESMTP id 50C3F43D45 for ; Sun, 12 Sep 2004 20:07:53 +0000 (GMT) (envelope-from keramida@linux.gr) Received: (qmail 17185 invoked by uid 207); 12 Sep 2004 20:07:52 -0000 Received: from keramida@linux.gr by nic by uid 201 with qmail-scanner-1.21 (sophie: 3.04/2.19/3.81. Clear:RC:1(81.186.70.47):. Processed in 0.995955 secs); 12 Sep 2004 20:07:52 -0000 Received: from dialup47.ach.sch.gr (HELO gothmog.gr) ([81.186.70.47]) (envelope-sender ) by nic.sch.gr (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 12 Sep 2004 20:07:50 -0000 Received: from gothmog.gr (gothmog [127.0.0.1]) by gothmog.gr (8.13.1/8.13.1) with ESMTP id i8CHOGgb001144 for ; Sun, 12 Sep 2004 20:24:16 +0300 (EEST) (envelope-from keramida@linux.gr) Received: (from giorgos@localhost) by gothmog.gr (8.13.1/8.13.1/Submit) id i8CFNpiJ024356; Sun, 12 Sep 2004 18:23:51 +0300 (EEST) (envelope-from keramida@linux.gr) Date: Sun, 12 Sep 2004 18:23:51 +0300 From: Giorgos Keramidas To: Rob Message-ID: <20040912152350.GB54693@gothmog.gr> References: <4140AFB0.6020002@pythonemproject.com> <4140C687.3080406@linuxpowered.com> <4140C9A7.9020407@pythonemproject.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4140C9A7.9020407@pythonemproject.com> Phone: +30-2610-312145 Mobile: +30-6944-116520 cc: freebsd-current@freebsd.org Subject: Mergemaster and a mess of /etc (was: Re: Still getting warning messages for rc.conf & default/rc.conf entries) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Sep 2004 20:07:55 -0000 On 2004-09-09 14:22, Rob wrote: > I will probably recompile the whole system. Have only used mergemaser > once, and somehow everything became a mess. Now I just compare > timestamps and do it manually. You can actually do this fast with the > right technique. Until I started using mergemaster almost exclusively, I used to update my /etc with the following sequence of steps: # cd /usr/src/etc # mkdir /tmp/temproot # make DESTDIR="/tmp/temproot" distrib-dirs # make DESTDIR="/tmp/temproot" distribution # cd /tmp/temproot ; diff -ruN /etc etc > /tmp/patchfile Then I manually edited /tmp/patchfile and applied it to my /etc taking care to run cap_mkdb on /etc/login.conf and pwd_mkdb if /etc/passwd was changed. All these can be handled by mergemaster just fine, though. I still do run the same sequence of steps from time to time, but only as a check to make sure that my /etc doesn't contain stale custom files (not included as part of the base system source) that I created some time ago and then forgot to update or delete when they became useless. To make a long story short, what exactly is it about mergemaster that gives you difficulties and why do you think that your /etc is a mess? A good way to find out is to run the commands shown above and then post the diff output saved in `/tmp/patchfile' to me. I'll check the differences of your /etc from the /usr/src/etc sources and tell you what I find out. * Note: the patchfile might contain critical information (such as the encrypted password of your root account). A bit of caution and a bit of careful editing of the file, to avoid posting sensitive information to a stranger like me (or even worse to a public list), would be fine. Just make sure you don't strip off useful stuff too. - Giorgos