On Sat, 19 Jan 2008 20:42:57 +0100 "Zbigniew Szalbot" <[EMAIL PROTECTED]> 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 18.104.22.168.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. _______________________________________________ firstname.lastname@example.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"