Date: Wed, 26 Dec 2001 00:55:53 -0500 (EST) From: <doug@safeport.com> To: freebsd-stable@freebsd.org Subject: Re: mergemaster problems in 4.5 Message-ID: <Pine.BSF.4.21.0112260026520.564-100000@pemaquid.safeport.com>
next in thread | raw e-mail | index | archive | help
This is just a heads up in case this error is not unique to my configuration. mergemaster incorrectly deletes files from temproot that have changed in 4.5, ..src/etc/defaults/rc.conf for example. More details: /var/tmp/temproot after mergemaster -v helen:/var/tmp/temproot# diff -sr --brief etc /etc | grep differ diff: etc/aliases: No such file or directory Files etc/csh.cshrc and /etc/csh.cshrc differ Files etc/csh.logout and /etc/csh.logout differ Files etc/group and /etc/group differ Files etc/hosts and /etc/hosts differ Files etc/inetd.conf and /etc/inetd.conf differ Files etc/master.passwd and /etc/master.passwd differ Files etc/motd and /etc/motd differ Files etc/shells and /etc/shells differ However ..src/etc shows slightly different results helen:/usr/home/fbsd/stable/src# diff -sr --brief etc /etc | grep differ Files etc/csh.cshrc and /etc/csh.cshrc differ Files etc/csh.logout and /etc/csh.logout differ Files etc/defaults/make.conf and /etc/defaults/make.conf differ Files etc/defaults/rc.conf and /etc/defaults/rc.conf differ Files etc/dhclient.conf and /etc/dhclient.conf differ Files etc/group and /etc/group differ Files etc/hosts and /etc/hosts differ Files etc/inetd.conf and /etc/inetd.conf differ Files etc/login.conf and /etc/login.conf differ Files etc/mail/Makefile and /etc/mail/Makefile differ Files etc/mail/aliases and /etc/mail/aliases differ Files etc/master.passwd and /etc/master.passwd differ Files etc/motd and /etc/motd differ Files etc/mtree/BSD.local.dist and /etc/mtree/BSD.local.dist differ Files etc/mtree/BSD.usr.dist and /etc/mtree/BSD.usr.dist differ Files etc/mtree/BSD.var.dist and /etc/mtree/BSD.var.dist differ Files etc/namedb/named.conf and /etc/namedb/named.conf differ Files etc/newsyslog.conf and /etc/newsyslog.conf differ Files etc/pam.conf and /etc/pam.conf differ Files etc/periodic/daily/200.backup-passwd and /etc/periodic/daily/200.backup-passwd differ Files etc/periodic/daily/450.status-security and /etc/periodic/daily/450.status-security differ Files etc/periodic/monthly/200.accounting and /etc/periodic/monthly/200.accounting differ Files etc/protocols and /etc/protocols differ Files etc/rc and /etc/rc differ Files etc/rc.atm and /etc/rc.atm differ Files etc/rc.diskless2 and /etc/rc.diskless2 differ Files etc/rc.network and /etc/rc.network differ Files etc/rc.network6 and /etc/rc.network6 differ Files etc/rc.shutdown and /etc/rc.shutdown differ Files etc/rc.syscons and /etc/rc.syscons differ Files etc/security and /etc/security differ Files etc/services and /etc/services differ Files etc/shells and /etc/shells differ Files etc/sysctl.conf and /etc/sysctl.conf differ If you take something known to have changed, i.e. ..src/etc/defaults/rc.conf in /etc/defaults: # $FreeBSD: src/etc/defaults/rc.conf,v 1.53.2.40 2001/09/14 17:28:11 imp Exp $ in ..src/etc/defaults: # $FreeBSD: src/etc/defaults/rc.conf,v 1.53.2.46 2001/12/12 23:51:00 nsayer Exp $ yet in the mergemaster log: *** Temp ./etc/defaults/rc.conf and installed have the same CVS Id, deleting *** Temp ./etc/defaults/make.conf and installed have the same CVS Id, deleting Hopefully I did something stupid, or there is something unique in my configuration (it is an NFS install). If not, the release is going to be exciting. I changed the kernel, setting "max users = 0". The system boots and runs, but this system is essentially a storage machine so it gets no real use. I haven't a clue as to what the "missing" files portend for a system that actually does something. _____ Douglas Denault doug@safeport.com Voice: 301-469-8766 Fax: 301-469-0601 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0112260026520.564-100000>