Re: Advice sought on upgrading from 4.11-R to 5.4...
Doug Barton [EMAIL PROTECTED] wrote: I disagree that ignoring comments in the files is a good idea. There is no way for mergemaster to know for sure if the comment is material or not, that's the admin's job. Furthermore, it is non-trivial to automatically detect that a change is inside a comment. Many files use #, but some files use ; or // for comments (e.g. BIND files), send- mail mc files use dnl to introduce comments, and I'm sure there are others. Ignoring everything that starts with # would be a particularly bad idea, because there are files where that character does _not_ introduce a comment. I agree with Doug that changes in comments are sometimes important enough to be read by the admin, e.g. if a default setting changes or an important new option is introduced. Of course, there are also sometimes changes that just fix typos, and dealing with those might be a waste of time, but that's no a valid reason to ignore _all_ changes inside comments. Here's my recommendation for /etc/mergemaster.rc: DIFF_FLAG='-Bub'# Hide changes in whitespace DIFF_OPTIONS='-I$FreeBSD:.*[$]' # Ignores CVS Id tags IGNORE_MOTD=yes # Ignores changes in motd Of course, as always: YMMV. Best regards Oliver -- Oliver Fromme, secnetix GmbH Co. KG, Marktplatz 29, 85567 Grafing Dienstleistungen mit Schwerpunkt FreeBSD: http://www.secnetix.de/bsd Any opinions expressed in this message may be personal to the author and may not necessarily reflect the opinions of secnetix in any way. C++ is the only current language making COBOL look good. -- Bertrand Meyer ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: Advice sought on upgrading from 4.11-R to 5.4...
At 9:42 PM +0200 2005-09-21, Brad Knowles wrote: I've seen the migration guide at http://www.freebsd.org/releases/5.4R/migration-guide.html, and the thread at http://lists.freebsd.org/pipermail/freebsd-stable/2005-September/018151.html, but I was wondering about the specific sequence of the upgrade process. Okay, well I've completed this part of the processing, going from 4.11-R to releng_5_4, and everything seems to be okay. I now need to make a custom kernel and to do a portupgrade, but unless something goes horribly wrong it would appear that this process was relatively painless. However, it would be nice if mergemaster could be made to automatically accept changes that occur only in the comments of the files it is trying to merge. That way, many fewer fluff changes would be presented during the merge process, and people would be left with needing to confirm changes regarding only actual functional code. Anyway, thanks again everyone! -- Brad Knowles, [EMAIL PROTECTED] Those who would give up essential Liberty, to purchase a little temporary Safety, deserve neither Liberty nor Safety. -- Benjamin Franklin (1706-1790), reply of the Pennsylvania Assembly to the Governor, November 11, 1755 SAGE member since 1995. See http://www.sage.org/ for more info. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: Advice sought on upgrading from 4.11-R to 5.4...
Brad Knowles wrote: However, it would be nice if mergemaster could be made to automatically accept changes that occur only in the comments of the files it is trying to merge. What would be nice is if people actually read the man page for mergemaster, which has had this example in it for a long time now. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: Advice sought on upgrading from 4.11-R to 5.4...
On 9/29/05, Doug Barton [EMAIL PROTECTED] wrote: Brad Knowles wrote: However, it would be nice if mergemaster could be made to automatically accept changes that occur only in the comments of the files it is trying to merge. What would be nice is if people actually read the man page for mergemaster, which has had this example in it for a long time now. I just read the mergemaster man page (6.0B2 box), and it contains no usch example, or reference. None of the options seem to have this effect either. Maybe you are thinking of an Open- of NetBSD mergemaster? ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: Advice sought on upgrading from 4.11-R to 5.4...
Robert Backhaus wrote: On 9/29/05, Doug Barton [EMAIL PROTECTED] wrote: Brad Knowles wrote: However, it would be nice if mergemaster could be made to automatically accept changes that occur only in the comments of the files it is trying to merge. What would be nice is if people actually read the man page for mergemaster, which has had this example in it for a long time now. I just read the mergemaster man page (6.0B2 box), and it contains no usch example, or reference. None of the options seem to have this effect either. Maybe you are thinking of an Open- of NetBSD mergemaster? Ah, I misread the original message. Usually people are complaining about the CVS Ids in the comments, as opposed to the comments themselves. I disagree that ignoring comments in the files is a good idea. There is no way for mergemaster to know for sure if the comment is material or not, that's the admin's job. Upgrading across a major version is a difficult task, no matter how its approached. IIRC, the original example was upgrading from 4.x to 5.x, which, like most major version upgrades, should be done by backing up your data and doing a fresh install anyway. This is particularly important over the 4 - 5 change, since by upgrading from source you're missing the UFS2 update. Thanks for pointing out that I missed the detail in the original post in any case. Doug ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: Advice sought on upgrading from 4.11-R to 5.4...
At 3:49 PM -0700 2005-09-28, Doug Barton wrote: What would be nice is if people actually read the man page for mergemaster, which has had this example in it for a long time now. I checked the man page. There is no direct ignore option, although there is a strict option. If you set up an /etc/mergemaster.rc, you can set up DIFF_OPTIONS= value, and there is an example of how to do that so that it ignores FreeBSD CVS Id tags. However, I was talking about ignoring all differences that occur only in comments (not just FreeBSD CVS Id tags), and it's not obvious as to how to modify the DIFF_OPTIONS= setting to suit. Moreover, I was hoping for a command-line option to control this setting, and that it might be set by default -- no /etc/mergemaster.rc required. -- Brad Knowles, [EMAIL PROTECTED] Those who would give up essential Liberty, to purchase a little temporary Safety, deserve neither Liberty nor Safety. -- Benjamin Franklin (1706-1790), reply of the Pennsylvania Assembly to the Governor, November 11, 1755 SAGE member since 1995. See http://www.sage.org/ for more info. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: Advice sought on upgrading from 4.11-R to 5.4...
At 4:15 PM -0700 2005-09-28, Doug Barton wrote: Ah, I misread the original message. Usually people are complaining about the CVS Ids in the comments, as opposed to the comments themselves. The CVS Ids are part of the issue, yes. But not the whole problem. I disagree that ignoring comments in the files is a good idea. There is no way for mergemaster to know for sure if the comment is material or not, that's the admin's job. Which is why I was hoping to be able to have a command-line option to control this function. Upgrading across a major version is a difficult task, no matter how its approached. IIRC, the original example was upgrading from 4.x to 5.x, which, like most major version upgrades, should be done by backing up your data and doing a fresh install anyway. This is particularly important over the 4 - 5 change, since by upgrading from source you're missing the UFS2 update. In my case, I don't want the UFS2 update. I have not been able to get FreeBSD-5.x CD-ROMs that are bootable on my machine, so I am forced to do a software upgrade. Moreover, I want to make sure that the filesystem remains readable to FreeBSD-4.x bootable CD-ROMs -- just in case there is a disaster. I saw all the comments that were pointed out by mergemaster, and many of them seemed to be mere changes in whitespace (could we at least automatically apply those?), some were correcting a minor typo, and there were a few that were a bit more extensive -- spread over a couple of lines or more. But every single one of them was relatively minor and I would have been very happy to have all of them automatically applied. -- Brad Knowles, [EMAIL PROTECTED] Those who would give up essential Liberty, to purchase a little temporary Safety, deserve neither Liberty nor Safety. -- Benjamin Franklin (1706-1790), reply of the Pennsylvania Assembly to the Governor, November 11, 1755 SAGE member since 1995. See http://www.sage.org/ for more info. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: Advice sought on upgrading from 4.11-R to 5.4...
Brad, On Wed, 28 Sep 2005, Brad Knowles wrote: However, it would be nice if mergemaster could be made to automatically accept changes that occur only in the comments of the files it is trying to merge. That way, many fewer fluff changes would be presented during the merge process, and people would be left with needing to confirm changes regarding only actual functional code. It's been mentioned on this list before, but sysutils/etcmerge can often provide a much faster way of bringing your system up to spec. Takes a bit of getting used to, but definitely worthwhile. David Adam [EMAIL PROTECTED] ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: Advice sought on upgrading from 4.11-R to 5.4...
I went via cvsup and a source tree, straight to 5.4 stable from 4.10 stable. Brad Knowles wrote: Folks, I've seen the migration guide at http://www.freebsd.org/releases/5.4R/migration-guide.html, and the thread at http://lists.freebsd.org/pipermail/freebsd-stable/2005-September/018151.html, but I was wondering about the specific sequence of the upgrade process. In particular, I'm wondering if I should go from RELENG_4_11_0_RELEASE direct to RELENG_5_4, or if I should instead go first to RELENG_5_0_0_RELEASE then to RELENG_5_4? I think the individual steps to follow and commands to execute during the upgrade are clear enough. But it's not obvious to me as to which precise CVSup targets should be used to pull down the source that would be compiled, etc -- __ Paul T. Root /_ \ 1977 MGB / /|| \\ ||\/ || _ | || || || \ ||__// \__/ ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: Advice sought on upgrading from 4.11-R to 5.4...
On Wed, Sep 21, 2005 at 09:42:24PM +0200, Brad Knowles wrote: Folks, I've seen the migration guide at http://www.freebsd.org/releases/5.4R/migration-guide.html, and the thread at http://lists.freebsd.org/pipermail/freebsd-stable/2005-September/018151.html, but I was wondering about the specific sequence of the upgrade process. And you should of course also read /usr/src/UPDATING as usual. In particular, I'm wondering if I should go from RELENG_4_11_0_RELEASE direct to RELENG_5_4, or if I should instead go first to RELENG_5_0_0_RELEASE then to RELENG_5_4? I would recommend going first to RELENG_5_3_0_RELEASE, and then to RELENG_5_4, but going directly to RELENG_5_4 will probably work fine as well - there were not all that many changes between 5.3 and 5.4. 5.3-RELEASE was the first stable release from the 5.x branch. I would not recommend using any earlier 5.x release. (I.e. don't use RELENG_5_0_0_RELEASE.) Of course, the officially recommended upgrade path is to backup all data (a very good idea in any case), reformat the disk, install the new system from scratch, and restore datafiles from the backup - but upgrading via source is certainly possible as well. I think the individual steps to follow and commands to execute during the upgrade are clear enough. But it's not obvious to me as to which precise CVSup targets should be used to pull down the source that would be compiled, etc -- Insert your favourite quote here. Erik Trulsson [EMAIL PROTECTED] ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: Advice sought on upgrading from 4.11-R to 5.4...
At 11:34 PM +0200 2005-09-21, Erik Trulsson wrote: And you should of course also read /usr/src/UPDATING as usual. That's the current version of the file from the 5.x tree, right? Is there any obvious way to see what this is without going ahead and downloading all the source anyway? Maybe there's something I'm missing, but this seems to be one of the really important files that is not easily available via the web interface on freebsd.org -- they've got the RELEASE_NOTES and a number of others, but not this one. Of course, the officially recommended upgrade path is to backup all data (a very good idea in any case), reformat the disk, install the new system from scratch, and restore datafiles from the backup - but upgrading via source is certainly possible as well. I had originally tried installing 5.x on this machine, but I could never get it to boot from the 5.x media. I did get it to boot from the 4.11-R media (both sets of media written by the same computer with the same CD-Writer and software), so that is what I installed. I'd like to be able to take the backup/wipe/re-install path, but I don't think that's going to be possible for me. -- Brad Knowles, [EMAIL PROTECTED] Those who would give up essential Liberty, to purchase a little temporary Safety, deserve neither Liberty nor Safety. -- Benjamin Franklin (1706-1790), reply of the Pennsylvania Assembly to the Governor, November 11, 1755 SAGE member since 1995. See http://www.sage.org/ for more info. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: Advice sought on upgrading from 4.11-R to 5.4...
Date: Thu, 22 Sep 2005 00:23:18 +0200 From: Brad Knowles [EMAIL PROTECTED] Sender: [EMAIL PROTECTED] At 11:34 PM +0200 2005-09-21, Erik Trulsson wrote: And you should of course also read /usr/src/UPDATING as usual. That's the current version of the file from the 5.x tree, right? Is there any obvious way to see what this is without going ahead and downloading all the source anyway? Maybe there's something I'm missing, but this seems to be one of the really important files that is not easily available via the web interface on freebsd.org -- they've got the RELEASE_NOTES and a number of others, but not this one. Check in the CVS repository: http://www.freebsd.org/cgi/cvsweb.cgi/src/UPDATING?annotate=1.342.2.24only_with_tag=RELENG_5_4 One down side of an upgrade in-place is that you don't get the larger root partition that is now default and you don't get UFS2 file systems on your partitions. -- R. Kevin Oberman, Network Engineer Energy Sciences Network (ESnet) Ernest O. Lawrence Berkeley National Laboratory (Berkeley Lab) E-mail: [EMAIL PROTECTED] Phone: +1 510 486-8634 ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: Advice sought on upgrading from 4.11-R to 5.4...
On Thursday, 22. September 2005 00:23, Brad Knowles wrote: At 11:34 PM +0200 2005-09-21, Erik Trulsson wrote: And you should of course also read /usr/src/UPDATING as usual. That's the current version of the file from the 5.x tree, right? Is there any obvious way to see what this is without going ahead and downloading all the source anyway? http://www.freebsd.org/cgi/cvsweb.cgi/src/UPDATING?rev=1.342.2.30content-type=text/x-cvsweb-markuponly_with_tag=RELENG_5 -- ,_, | Michael Nottebrock | [EMAIL PROTECTED] (/^ ^\) | FreeBSD - The Power to Serve | http://www.freebsd.org \u/ | K Desktop Environment on FreeBSD | http://freebsd.kde.org pgp8woGWeaH05.pgp Description: PGP signature
Re: Advice sought on upgrading from 4.11-R to 5.4...
At 4:56 PM -0700 2005-09-21, Kevin Oberman wrote: Check in the CVS repository: http://www.freebsd.org/cgi/cvsweb.cgi/src/UPDATING?annotate=1.342.2.24only_with_tag=RELENG_5_4 Thanks for the pointer! One down side of an upgrade in-place is that you don't get the larger root partition that is now default and you don't get UFS2 file systems on your partitions. I almost never take the default installation options whenever I'm building a system. They almost always result in the root filesystem being laughably small, or whatever. In my case, I've got a 256MB root filesystem with 150MB free, so I think I'm okay there. I did get burned with /usr being too small, even at 2GB. With all the ports and stuff I've installed, I had to move /usr/local to a separate filesystem (which I already had), and put a symlink in place. As for UFS2, since I can't get this machine to boot off CD-ROM with the 5.x images (at least, not the ones I've tried in the past), I would like to keep the system in UFS1 anyway, just in case I need to reboot off the 4.x CD-ROMs and try to do some recovery things. -- Brad Knowles, [EMAIL PROTECTED] Those who would give up essential Liberty, to purchase a little temporary Safety, deserve neither Liberty nor Safety. -- Benjamin Franklin (1706-1790), reply of the Pennsylvania Assembly to the Governor, November 11, 1755 SAGE member since 1995. See http://www.sage.org/ for more info. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to [EMAIL PROTECTED]
