From owner-freebsd-stable Sat Jun 24 10:45:56 2000 Delivered-To: freebsd-stable@freebsd.org Received: from mta03-svc.ntlworld.com (mta03-svc.ntlworld.com [62.253.162.43]) by hub.freebsd.org (Postfix) with ESMTP id 6DEF037B88E for ; Sat, 24 Jun 2000 10:45:51 -0700 (PDT) (envelope-from mark@ukug.uk.freebsd.org) Received: from parish.my.domain ([62.253.89.228]) by mta03-svc.ntlworld.com (InterMail vM.4.01.02.27 201-229-119-110) with ESMTP id <20000624174549.OHRV290.mta03-svc.ntlworld.com@parish.my.domain>; Sat, 24 Jun 2000 18:45:49 +0100 Received: (from mark@localhost) by parish.my.domain (8.9.3/8.9.3) id SAA03842; Sat, 24 Jun 2000 18:31:37 +0100 (BST) (envelope-from mark) Date: Sat, 24 Jun 2000 18:31:36 +0100 From: Mark Ovens To: John Polstra Cc: mvh@ix.netcom.com, stable@freebsd.org Subject: Re: HEADS UP: softupdates mess in src/sys/ufs/ffs Message-ID: <20000624183136.B233@parish> References: <20000622041129.02E19E6FEF@netcom1.netcom.com> <200006221652.JAA91378@vashon.polstra.com> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Mailer: Mutt 1.0.1i In-Reply-To: <200006221652.JAA91378@vashon.polstra.com>; from jdp@polstra.com on Thu, Jun 22, 2000 at 09:52:42AM -0700 Organization: Total lack of Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Thu, Jun 22, 2000 at 09:52:42AM -0700, John Polstra wrote: > In article <20000622041129.02E19E6FEF@netcom1.netcom.com>, > Mike Harding wrote: > > > > I just did a 'cvsup' of 4.0-RELENG and the soft update links in > > /usr/src/sys/ufs/ffs got deleted. Created them again, ran cvsup > > again, and they got deleted again. Anyone know what's going on? > > I just found out about this this morning. There's a bit of a > mess in that directory. Somebody put the softupdates files into > /home/ncvs/src/sys/ufs/ffs manually on June 21. The files were > damaged -- each one had two RELENG_3 tags pointing to different > branches. That caused cvsup-master's cvsup jobs to start dying > prematurely. (Yes, the dying should be considered a bug.) > > I deleted the offending files from src/sys/ufs/ffs just now. Now > here is what I think will happen to all of you. On your next CVSup > update, it will delete your softupdates files and/or symlinks in > src/sys/ufs/ffs. Let that go ahead and happen. Then you should be > able to create your symlinks again and have them remain untouched by > CVSup thereafter. > Not quite, it doesn't delete symlinks. I had symlinks: # cd /usr/src/sys/ufs/ffs # ls -l [snip] lrwxr-xr-x 1 root wheel 39 6 Mar 20:34 ffs_softdep.c -> ../../contrib/softupdates/ffs_softdep.c [snip] lrwxr-xr-x 1 root wheel 35 6 Mar 20:34 softdep.h -> ../../contrib/softupdates/softdep.h cvsup(1) didn't delete the symlinks, just the targets: Delete src/sys/contrib/softupdates/ffs_softdep.c Delete src/sys/contrib/softupdates/softdep.h then I got: Cannot calculate checksum for "/usr/src/sys/ufs/ffs/ffs_softdep.c": No such file or directory Cannot calculate checksum for "/usr/src/sys/ufs/ffs/softdep.h": No such file or directory Now the links were pointing to non-existent files so I rm(1)'d the links and re-cvsup(1)'d which checked out the new files: Updating collection src-all/cvs Checkout src/sys/ufs/ffs/ffs_softdep.c Checkout src/sys/ufs/ffs/softdep.h So, if you have symlinks to contrib/softupdates then you will have to manually rm(1) them. I guess that if you do this prior to running cvsup(1) for the first time it will update your system correctly without the need to run cvsup(1) twice. > Please don't anybody try to move softupdates into that directory > again without talking to me first. > > John > -- > John Polstra jdp@polstra.com > John D. Polstra & Co., Inc. Seattle, Washington USA > "Disappointment is a good sign of basic intelligence." -- Chögyam Trungpa > > > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-stable" in the body of the message -- If I buy a copy of WinDelete, and it doesn't delete Windows, am I entitled to my money back? ________________________________________________________________ FreeBSD - The Power To Serve http://www.freebsd.org My Webpage http://ukug.uk.freebsd.org/~mark/ mailto:mark@ukug.uk.freebsd.org http://www.radan.com To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message