Hello! As long time FreeBSD user I am concerned about RELEASE and STABLE configuration files inconsistency. No big deal but really annoying if you want to upgrade systems occassionally. The problem is that there is huge amount of old files between RELEASE and STABLE config files- more precisely lots of older config files in STABLE that is really strange considered that it should be much newer than RELEASE. FE: -# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37.18.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37 2004/10/07 13:55:26 mtm Exp $ -# $FreeBSD: src/etc/rc.d/newsyslog,v 1.5.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/rc.d/newsyslog,v 1.5.2.1 2008/01/28 07:55:44 dougb Exp $ -# $FreeBSD: src/etc/rc.d/nfsclient,v 1.6.6.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/rc.d/nfsclient,v 1.6 2006/12/31 10:37:18 yar Exp $ -# $FreeBSD: src/etc/rc.d/nfsd,v 1.13.10.1.2.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/rc.d/nfsd,v 1.13.10.1 2008/01/28 07:55:44 dougb Exp $ -# $FreeBSD: src/etc/crontab,v 1.32.32.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/crontab,v 1.32 2002/11/22 16:13:39 tom Exp $ Oh, and why I have to remove myself from the system? I don't get it. Same problem with master.password file- why the hell I have to change that? -# $FreeBSD: src/etc/group,v 1.35.6.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/group,v 1.35 2007/06/11 18:36:39 ceri Exp $ # -wheel:*:0:root,antik +wheel:*:0:root daemon:*:1: kmem:*:2: sys:*:3: @@ -29,4 +29,3 @@ www:*:80: nogroup:*:65533: nobody:*:65534: -antik:*:1001: How comes that difference is 4 years? Of course files are identical but this is annoying to go through files that is not changed at all. Some files are newer- that's expected BTW. Please syncronize your cvs between releases.
On Thu, 12 Mar 2009, Andrei Kolu wrote:> Hello! > > As long time FreeBSD user I am concerned about RELEASE and STABLE > configuration files inconsistency.This topic was covered recently, you might want to check the archives.> -# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37.18.1 2008/11/25 02:59:29 > kensmith Exp $ > +# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37 2004/10/07 13:55:26 mtm Exp $What you're seeing is an artifact of the way that CVS deals with cutting a release. Even though the content of the files is the same, the CVS Id is updated in the release branch so that you can track revisions to that file that occur within that branch (e.g., RELENG_6_4), as opposed to the changes that occur in the parent branch (RELENG_6). This is a feature. You can easily deal with this in mergemaster by using the -U option (please see the man page). If you're dealing with the problem of a clean installation from a -RELEASE CD (or similar) upgrading to the stable branch for the first time, -U won't help you unfortunately. But it will help you on each successive update. For that first update what I usually do is 'rm -r /etc/rc.d/* /etc/periodic/* /etc/defaults/*' and then use mergemaster's -i option. That will cover the majority of the problem. hope this helps, Doug -- This .signature sanitized for your protection
This is what I have in my /etc/mergemaster.rc; it will
probably help in your case:
DIFF_FLAG='-Bub'
DIFF_OPTIONS='-I$FreeBSD:.*[$]'
IGNORE_MOTD=yes
The first line causes diff to not display changes that
only affect whitespace. The second line ignores the CVS
id lines, so that files will compare equal that only differ
in the CVS ids. The third line lets me keep my motd file
without being asked for it every time.
There are options to keep other files, too, so you might
want to add the master.passwd and group files to that list.
However, sometines a new group or user needs to be created
for proper operation -- that's why I prefer to see those
files whenever they change.
Please refer to the mergemaster(8) manual page for details.
You might also want so set AUTO_INSTALL and AUTO_UPGRADE.
Best regards
Oliver
PS: I think the above options should _not_ be on by
default, because that would be a POLA violation.
Those people who want them can easily add them to their
mergemaster.rc file.
--
Oliver Fromme, secnetix GmbH & Co. KG, Marktplatz 29, 85567 Grafing b. M.
Handelsregister: Registergericht Muenchen, HRA 74606, Gesch?ftsfuehrung:
secnetix Verwaltungsgesellsch. mbH, Handelsregister: Registergericht M?n-
chen, HRB 125758, Gesch?ftsf?hrer: Maik Bachmann, Olaf Erb, Ralf Gebhart
FreeBSD-Dienstleistungen, -Produkte und mehr: http://www.secnetix.de/bsd
"Perl will consistently give you what you want,
unless what you want is consistency."
-- Larry Wall