Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
Torfinn Ingolfsen wrote: On Sat, 16 May 2009 16:13:12 -0700 Doug Barton do...@freebsd.org wrote: You should be able to grab the file from HEAD and run it on RELENG_[67] without any problems. I will MFC it as rapidly as possible. FWIW, today I upgraded a machine from 7.1-stable (dated 2009-01-11) to 7.2-stable (csup'ed today). For the mergemaster steps in the make world procedure, I used /usr/src/usr/sbin/mergemaster/mergemaster.sh instead of just mergemaster. Worked like a charm. Thanks! Good news, thanks! Doug -- This .signature sanitized for your protection ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
On Sat, 16 May 2009 16:13:12 -0700 Doug Barton do...@freebsd.org wrote: You should be able to grab the file from HEAD and run it on RELENG_[67] without any problems. I will MFC it as rapidly as possible. FWIW, today I upgraded a machine from 7.1-stable (dated 2009-01-11) to 7.2-stable (csup'ed today). For the mergemaster steps in the make world procedure, I used /usr/src/usr/sbin/mergemaster/mergemaster.sh instead of just mergemaster. Worked like a charm. Thanks! -- Regards, Torfinn Ingolfsen ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
I think I now know what was causing the problem with the files being overwritten, the saved mtree database was somehow reduced to zero bytes causing the list of CHANGED files to be empty. Unfortunately I haven't tracked down the cause of why the mtree file would get emptied out (given that there is already code that should prevent that problem) but I have just committed r192230 which adds a lot of safety belts to the code involving creating and updating the mtree database, and creating and using the list of files with changes. It should no longer be possible to even enter the -U code unless there is both a valid mtree file AND a valid list of files with local changes. FWIW I've also improved the performance of the -U option by changing a use of grep for every file to using case. You should be able to grab the file from HEAD and run it on RELENG_[67] without any problems. I will MFC it as rapidly as possible. Sorry for the inconvenience, Doug -- This .signature sanitized for your protection ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
On Sun, 10 May 2009 21:49:23 -0700 Doug Barton do...@freebsd.org wrote: Torfinn Ingolfsen wrote: To be clear, I follow this procedure: 1. make buildworld 2. make kernel 3. shutdown now 4. mergemaster -p 5. make installworld 6. mergemaster -iU 7. fastboot By any chance is any of this happening in a jail? No - no jails. Or by any chance is /etc a symlink? No, /etc is a regular directory (I just checked the machines). -- Regards, Torfinn Ingolfsen ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
Torfinn Ingolfsen wrote: To be clear, I follow this procedure: 1. make buildworld 2. make kernel 3. shutdown now 4. mergemaster -p 5. make installworld 6. mergemaster -iU 7. fastboot By any chance is any of this happening in a jail? Or by any chance is /etc a symlink? A user sent me a very interesting patch related to the use of -U in a jail that might be relevant here. Doug ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
Am 05.05.2009, 09:46 Uhr, schrieb Daniel Gerzo dan...@freebsd.org: Manolis Kiagias wrote: I always use -iU too. I've lost motd, passwd, group and master.passwd During mergemaster -p I was asked to merge changes to some of these, and still they were replaced with the newer versions. I don't know what went wrong but have restored them from backup. (I always tar /etc before a source upgrade). Upgrading another system using freebsd-update did not cause any problem. I have the same experience while I was upgrading a few machines upgrading from RELENG_7 to RELENG_7_2. I haven't experienced when upgrading from 7.1-R to 7.2-R. Careful there - RELENG_7 is _newer_ than RELENG_7_2. The latter is branched off RELENG_7 at some point and progresses much slower (as in: errata and security, but no development), so that's no update, but often the reverse. -- Matthias Andree ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
On Thu, 07 May 2009 09:40:52 +0200, Matthias Andree m...@dt.e-technik.tu-dortmund.de wrote: Am 05.05.2009, 09:46 Uhr, schrieb Daniel Gerzo dan...@freebsd.org: Manolis Kiagias wrote: I always use -iU too. I've lost motd, passwd, group and master.passwd During mergemaster -p I was asked to merge changes to some of these, and still they were replaced with the newer versions. I don't know what went wrong but have restored them from backup. (I always tar /etc before a source upgrade). Upgrading another system using freebsd-update did not cause any problem. I have the same experience while I was upgrading a few machines upgrading from RELENG_7 to RELENG_7_2. I haven't experienced when upgrading from 7.1-R to 7.2-R. Careful there - RELENG_7 is _newer_ than RELENG_7_2. The latter is branched off RELENG_7 at some point and progresses much slower (as in: errata and security, but no development), so that's no update, but often the reverse. That's not definitely true all the time. You could for example update your 7.1 to releng_7, say in Sept. 2008, then run this box until releng_7_2 was branched and when you update to it at that point you actually are doing an update, definitely not a downgrade. -- Kind regards Daniel ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
On Tue, 05 May 2009 14:28:22 -0700 Doug Barton do...@freebsd.org wrote: I've read this thread and find the whole thing very odd. In particular I agree - it is odd. I have a few more machines to upgrade in the coming weeks - if anyone have a better testcase to find out what is going on, I'm ready for it. That shouldn't even be possible. You have to affirmatively choose 'i' (for install) for it to be installed at all, the default is to leave it in the temproot directory. Additionally, the code to handle deleting is some of the oldest code in the script, and hasn't changed in over 8 years. Well, something has changed in the way mergemaster handles this, unless there is something else in the make world procedure that updates files in /etc? To be clear, I follow this procedure: 1. make buildworld 2. make kernel 3. shutdown now 4. mergemaster -p 5. make installworld 6. mergemaster -iU 7. fastboot I saw your followup message, can you please do me a favor and modify your /etc/motd file again, then run the following in a script(1) and send me the log? /bin/sh -x mergemaster -iU Done - sent in personal mail. HTH -- Regards, Torfinn Ingolfsen ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
Manolis Kiagias wrote: I always use -iU too. I've lost motd, passwd, group and master.passwd During mergemaster -p I was asked to merge changes to some of these, and still they were replaced with the newer versions. I don't know what went wrong but have restored them from backup. (I always tar /etc before a source upgrade). Upgrading another system using freebsd-update did not cause any problem. I have the same experience while I was upgrading a few machines upgrading from RELENG_7 to RELENG_7_2. I haven't experienced when upgrading from 7.1-R to 7.2-R. Here auth.conf, csh.cshrc, hosts, crontab, syslogd.conf, passswd, master.passwd, group, sysctl.conf motd and maybe some more got overwritten :-( I had to restore from backups. -- S pozdravom / Best regards Daniel Gerzo, FreeBSD committer ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
On Tue, May 05, 2009 at 09:46:22AM +0200, Daniel Gerzo wrote: Manolis Kiagias wrote: I always use -iU too. I've lost motd, passwd, group and master.passwd During mergemaster -p I was asked to merge changes to some of these, and still they were replaced with the newer versions. I don't know what went wrong but have restored them from backup. (I always tar /etc before a source upgrade). Upgrading another system using freebsd-update did not cause any problem. I have the same experience while I was upgrading a few machines upgrading from RELENG_7 to RELENG_7_2. I haven't experienced when upgrading from 7.1-R to 7.2-R. Here auth.conf, csh.cshrc, hosts, crontab, syslogd.conf, passswd, master.passwd, group, sysctl.conf motd and maybe some more got overwritten :-( I had to restore from backups. When upgrading from 7-STABLE to 7.2-RELEASE mergemaster -s -i -U overwrote all the file I'd changed without asking. Luckily I keep all config files that I've changed in a separate repository, so putting it all back was a question of running an install script. But the change is annoying. Roland -- R.F.Smith http://www.xs4all.nl/~rsmith/ [plain text _non-HTML_ PGP/GnuPG encrypted/signed email much appreciated] pgp: 1A2B 477F 9970 BA3C 2914 B7CE 1277 EFB0 C321 A725 (KeyID: C321A725) pgpWWYsyTGg1G.pgp Description: PGP signature
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
On Mon, May 4, 2009 at 10:50 PM, Torfinn Ingolfsen torfinn.ingolf...@broadpark.no wrote: I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as of today, using csup and building world. i upgraded fw machines from _7_1 to _7_2. no problem at all here. did mergemaster is changed from -RELEASE to -STABLE? hint: use always -P option -- Cris, member of G.U.F.I Italian FreeBSD User Group http://www.gufi.org/ ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
Cristiano Deana wrote: On Mon, May 4, 2009 at 10:50 PM, Torfinn Ingolfsen torfinn.ingolf...@broadpark.no wrote: I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as of today, using csup and building world. i upgraded fw machines from _7_1 to _7_2. no problem at all here. did mergemaster is changed from -RELEASE to -STABLE? The last change was before the 7.2-release cycle started (6 weeks ago). hint: use always -P option I agree, it's a good thing to have in your .mergemasterrc (PRESERVE_FILES=yes). Doug -- This .signature sanitized for your protection ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
Torfinn Ingolfsen wrote: Ok, this is strange. I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as of today, using csup and building world. I've read this thread and find the whole thing very odd. In particular regarding your case, the last change to mergemaster was done on March 23rd, so if you updated a system on April 1st then again on May 4th you should have been using the same version of mergemaster. As part of that process I did (as I always do) 'mergemaster -iU' after the 'make installworld' step. /etc/passwd (mergemaster sked about it, I pressed 'd', but it was still upgraded, ugh!) /etc/group (mergemaster sked about it, I pressed 'd', but it was still upgraded, ugh!) That shouldn't even be possible. You have to affirmatively choose 'i' (for install) for it to be installed at all, the default is to leave it in the temproot directory. Additionally, the code to handle deleting is some of the oldest code in the script, and hasn't changed in over 8 years. I saw your followup message, can you please do me a favor and modify your /etc/motd file again, then run the following in a script(1) and send me the log? /bin/sh -x mergemaster -iU Thanks, Doug -- This .signature sanitized for your protection ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
On Tue, 05 May 2009 14:28:22 -0700 Doug Barton do...@freebsd.org wrote: Torfinn Ingolfsen wrote: Ok, this is strange. I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as of today, using csup and building world. I've read this thread and find the whole thing very odd. In particular regarding your case, the last change to mergemaster was done on March 23rd, so if you updated a system on April 1st then again on May 4th you should have been using the same version of mergemaster. There was a recent thread on -questions about this issue too, with the title mergemaster -U overwriting modified files. I've seen mergemaster clobber named.conf but I've failed to repeat it despite changing the revision, file timestamp etc. -- Bruce Cran ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
Ok, this is strange. I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as of today, using csup and building world. As part of that process I did (as I always do) 'mergemaster -iU' after the 'make installworld' step. A few files on my machines are modified by me, and thus should nevber be upgraded: /etc/dhclient.conf /etc/motd (mergemeaster will usually ask about this - this time it did not, it claimed it wasn't user modified, huh?) /etc/profile /root/.profile /etc/passwd (mergemaster sked about it, I pressed 'd', but it was still upgraded, ugh!) /etc/group (mergemaster sked about it, I pressed 'd', but it was still upgraded, ugh!) It can be more files, I haven't found out yet. Has anyone else seen this? I am upgrading my next machine, this time I'll have backups and keep better notes. -- Regards, Torfinn Ingolfsen ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
Torfinn Ingolfsen wrote: Ok, this is strange. I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as of today, using csup and building world. As part of that process I did (as I always do) 'mergemaster -iU' after the 'make installworld' step. A few files on my machines are modified by me, and thus should nevber be upgraded: /etc/dhclient.conf /etc/motd (mergemeaster will usually ask about this - this time it did not, it claimed it wasn't user modified, huh?) /etc/profile /root/.profile /etc/passwd (mergemaster sked about it, I pressed 'd', but it was still upgraded, ugh!) /etc/group (mergemaster sked about it, I pressed 'd', but it was still upgraded, ugh!) It can be more files, I haven't found out yet. Has anyone else seen this? I am upgrading my next machine, this time I'll have backups and keep better notes. I always use -iU too. I've lost motd, passwd, group and master.passwd During mergemaster -p I was asked to merge changes to some of these, and still they were replaced with the newer versions. I don't know what went wrong but have restored them from backup. (I always tar /etc before a source upgrade). Upgrading another system using freebsd-update did not cause any problem. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
On 4/5/09 21:50, Torfinn Ingolfsen wrote: Ok, this is strange. I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as of today, using csup and building world. As part of that process I did (as I always do) 'mergemaster -iU' after the 'make installworld' step. A few files on my machines are modified by me, and thus should nevber be upgraded: /etc/dhclient.conf /etc/motd (mergemeaster will usually ask about this - this time it did not, it claimed it wasn't user modified, huh?) /etc/profile /root/.profile /etc/passwd (mergemaster sked about it, I pressed 'd', but it was still upgraded, ugh!) /etc/group (mergemaster sked about it, I pressed 'd', but it was still upgraded, ugh!) It can be more files, I haven't found out yet. Has anyone else seen this? I am upgrading my next machine, this time I'll have backups and keep better notes. Not that its a cure but are master.passwd and group backups in /var/backups any help to you in this case? Vince ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
On Mon, 04 May 2009 22:26:52 +0100 Vincent Hoffman vi...@unsane.co.uk wrote: Not that its a cure but are master.passwd and group backups in /var/backups any help to you in this case? Ah - great tip - thanks! (In case of the first server, the changes to group and passwd files were few, so I just re-did the changes from memory. The only part I had to look up was user and group mysql. So restoring from /var/backups would have been quicker.) -- Regards, Torfinn Ingolfsen ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
