From owner-freebsd-questions@FreeBSD.ORG Sun Jan 20 00:23:41 2008 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2737616A417 for ; Sun, 20 Jan 2008 00:23:41 +0000 (UTC) (envelope-from fbsd06+SK=d329cc7e@mlists.homeunix.com) Received: from turtle-out.mxes.net (turtle-out.mxes.net [216.86.168.191]) by mx1.freebsd.org (Postfix) with ESMTP id EEACC13C469 for ; Sun, 20 Jan 2008 00:23:40 +0000 (UTC) (envelope-from fbsd06+SK=d329cc7e@mlists.homeunix.com) Received: from mxout-04.mxes.net (mxout-04.mxes.net [216.86.168.179]) by turtle-in.mxes.net (Postfix) with ESMTP id EAE7F163F80 for ; Sat, 19 Jan 2008 19:00:51 -0500 (EST) Received: from gumby.homeunix.com. (unknown [87.81.140.128]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.mxes.net (Postfix) with ESMTP id 7B941D05AE for ; Sat, 19 Jan 2008 19:00:50 -0500 (EST) Date: Sun, 20 Jan 2008 00:00:48 +0000 From: RW To: freebsd-questions@freebsd.org Message-ID: <20080120000048.0cee1189@gumby.homeunix.com.> In-Reply-To: <94136a2c0801191142r51a7715by99e56ee658621e5d@mail.gmail.com> References: <94136a2c0801191142r51a7715by99e56ee658621e5d@mail.gmail.com> X-Mailer: Claws Mail 3.0.2 (GTK+ 2.12.5; i386-portbld-freebsd7.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: 6.2-Release to 6.3-Release and automatically merge changes X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jan 2008 00:23:41 -0000 On Sat, 19 Jan 2008 20:42:57 +0100 "Zbigniew Szalbot" wrote: > Hello, > > Encouraged by an apparent ease of use of FreeBSD update utility to go > to 6.3 I decided to perform the update on an office machine, too. I > issued: > > $ sh freebsd-update.sh -f freebsd-update.conf -r 6.3-RELEASE upgrade > > and after some time there came a screen like this: > > Attempting to automatically merge changes in files... done. > > The following file could not be merged automatically: > /etc/defaults/periodic.conf Anything in /etc/defaults/ should not have been edited, so just accept the new version. If you *have* edited it, you'll have to handle this manually, and put you changes in the right place. > # $FreeBSD: src/etc/defaults/periodic.conf,v 1.33.2.3.2.1 2007/12/06 > 08:11:19 jhb Exp $ > >>>>>>> 6.3-RELEASE > > Now, I can't be 100% certain but I think I have never touched > periodic.conf and not really sure how to progress on from here. This is also in /etc/defaults/, it's not the normal periodic.conf, so see above. > Another example is rc.conf which of course I edited in the past adding > various services as needed. > > <<<<<<< current version > ======= > #background_dhclient_fxp0="YES" # Start dhcp client on fxp0 in the > background. synchronous_dhclient="YES" # Start dhclient directly > on configured # interfaces during startup. > >>>>>>> 6.3-RELEASE If we are talking about /etc/rc.conf (rather than /etc/defaults/rc.conf) then keep the old version as this file is empty by default. > Then it asked about sendmail files which I have never ever touched (I > do not use sendmail). Some others are not sendmail-related but I have > not touched them either. Accept the new versions.