Re: 6.2-Release to 6.3-Release and automatically merge changes
Hello, 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. I don't think I have ever edited any file in /etc/defaults but then... sometimes my mind plays a trick on me. 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. When I have these strings: 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 Which lines should I delete and which leave intact? This one here is short but there are some other where the changes apply to quite a few lines. I have trouble finding out how to accept the new versions? Thanks! Zbigniew Szalbot ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: 6.2-Release to 6.3-Release and automatically merge changes
On Sun, 20 Jan 2008 16:13:26 +0100 Zbigniew Szalbot [EMAIL PROTECTED] wrote: Which lines should I delete and which leave intact? This one here is short but there are some other where the changes apply to quite a few lines. I have trouble finding out how to accept the new versions? I've not used freebsd-update.sh, I assumed it was just calling mergemaster. Does it really not give you option of accepting a whole file? ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: 6.2-Release to 6.3-Release and automatically merge changes
Hello, 2008/1/20, RW [EMAIL PROTECTED]: On Sun, 20 Jan 2008 16:13:26 +0100 Zbigniew Szalbot [EMAIL PROTECTED] wrote: Which lines should I delete and which leave intact? This one here is short but there are some other where the changes apply to quite a few lines. I have trouble finding out how to accept the new versions? I've not used freebsd-update.sh, I assumed it was just calling mergemaster. Does it really not give you option of accepting a whole file? No, it says (for example) 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... So I have the vi open but I wonder which lines to remove and which to leave? Thanks! Zbigniew Szalbot ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: 6.2-Release to 6.3-Release and automatically merge changes
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 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. ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
