From owner-freebsd-questions@FreeBSD.ORG Sat Jan 19 19:42:59 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 9A29916A41A for ; Sat, 19 Jan 2008 19:42:59 +0000 (UTC) (envelope-from zszalbot@gmail.com) Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.157]) by mx1.freebsd.org (Postfix) with ESMTP id 39BF713C45B for ; Sat, 19 Jan 2008 19:42:58 +0000 (UTC) (envelope-from zszalbot@gmail.com) Received: by fg-out-1718.google.com with SMTP id 16so1646542fgg.35 for ; Sat, 19 Jan 2008 11:42:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition; bh=s/h4RV3LhTNm+o57yKzgfSfT5y8U/4+4WrSTB/cHj3E=; b=A3H3EFUtmIHqKrcwqt/ftaHMCvTxg8h+RSdfOxHTWmsQE6XlBFBOEO9TmC4ZieivhZX7hIBaC059LlLQ9VVwFD2w8fM+b+2oL1akARsICVxowZlYrWcngfKdB9bptt7woPA0WQFWZhwA3l/6DJNYgiXV9z+t2GJXG+xkj5BRNP8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition; b=IjBQxp+tXNxxmfCs1gG+0HIvZvO9AeicRzt6aRJfhGosooU3Uc82ss7cRJFEUpwKYHguEsUp3F0xu/TzyRXU6OruF8v/pwAa+cxnWLr5kRT5AmorTRmvBt+BsXyTn3tSL9H7kY+vF2LSpH9nePxV5lwp26lu5s+YNxb060dL31Q= Received: by 10.78.183.8 with SMTP id g8mr6972344huf.55.1200771777653; Sat, 19 Jan 2008 11:42:57 -0800 (PST) Received: by 10.78.130.5 with HTTP; Sat, 19 Jan 2008 11:42:57 -0800 (PST) Message-ID: <94136a2c0801191142r51a7715by99e56ee658621e5d@mail.gmail.com> Date: Sat, 19 Jan 2008 20:42:57 +0100 From: "Zbigniew Szalbot" To: freebsd-questions@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline Subject: 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: Sat, 19 Jan 2008 19:42:59 -0000 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 Press Enter to edit this file in vi and resolve the conflicts manually... <<<<<<< current version # $FreeBSD: src/etc/defaults/periodic.conf,v 1.33.2.1 2006/03/08 23:01:18 brueffer Exp $ ======= # $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. 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 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. /etc/mail/freebsd.cf /etc/mail/freebsd.mc /etc/mail/freebsd.submit.cf /etc/mail/freebsd.submit.mc /etc/mail/helpfile /etc/mail/sendmail.cf /etc/mail/submit.cf /etc/network.subr /etc/pccard_ether /etc/rc.d/ldconfig /etc/rc.d/mountcritlocal /etc/rc.d/moused /etc/rc.d/netif /etc/rc.d/nsswitch /etc/rc.d/ppp /etc/rc.d/ypxfrd /etc/rc.initdiskless /etc/rc.subr /etc/snmpd.config What would you advise me to do? I seem to remember I had a similar trouble going from 6.1 to 6.2. In that case I must have made some mistakes while merging changes because the machine wouldn't start. I seem to recall that I had to copy /etc from backup to make the machine work. I fear it may happen again and I am not really sure which part of the files I should be editing as - frankly - I have no idea what the changes are. Any advice? Many thanks in advance! Zbigniew Szalbot