From owner-cvs-all  Thu Jul 13 16: 0:24 2000
Delivered-To: cvs-all@freebsd.org
Received: from genius.systems.pavilion.net (genesis.tao.org.uk [194.242.131.254])
	by hub.freebsd.org (Postfix) with ESMTP
	id 744B237B8D1; Thu, 13 Jul 2000 16:00:17 -0700 (PDT)
	(envelope-from joe@pavilion.net)
Received: by genius.systems.pavilion.net (Postfix, from userid 100)
	id 6E1ED11388; Fri, 14 Jul 2000 00:02:57 +0100 (BST)
Date: Fri, 14 Jul 2000 00:02:57 +0100
From: Josef Karthauser <joe@pavilion.net>
To: Josef Karthauser <joe@FreeBSD.org>
Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/usr.sbin/mtree mtree.8 verify.c
Message-ID: <20000714000257.M97361@pavilion.net>
References: <200007132228.PAA91457@freefall.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2i
In-Reply-To: <200007132228.PAA91457@freefall.freebsd.org>; from joe@FreeBSD.org on Thu, Jul 13, 2000 at 03:28:40PM -0700
X-NCC-RegID: uk.pavilion
Organisation: Pavilion Internet plc, Lees House, 21-23 Dyke Road, Brighton, England
Phone: +44-845-333-5000
Fax: +44-845-333-5001
Mobile: +44-403-596893
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

On Thu, Jul 13, 2000 at 03:28:40PM -0700, Josef Karthauser wrote:
> joe         2000/07/13 15:28:40 PDT
> 
>   Modified files:
>     usr.sbin/mtree       mtree.8 verify.c 
>   Log:
>   Allow symlinks to be created if they appear in the mtree specification.
>   
>   PR:	bin/14171

Does anyone object to the following patch.  It pulls the creation of
the /sys symlink back into BSD.root.dist.

Joe


Index: Makefile
===================================================================
RCS file: /home/ncvs/src/etc/Makefile,v
retrieving revision 1.227
diff -u -r1.227 Makefile
--- Makefile	2000/07/02 15:55:25	1.227
+++ Makefile	2000/07/13 22:28:06
@@ -143,14 +143,13 @@
 .endif
 
 distrib-dirs:
-	mtree -deU -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/
+	mtree -eUS -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/
 	mtree -deU -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var
 	mtree -deU -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr
 	mtree -deU -f ${.CURDIR}/mtree/BSD.include.dist \
 		-p ${DESTDIR}/usr/include
 	mtree -deU -f ${.CURDIR}/mtree/BSD.include.dist \
 		-p ${DESTDIR}/usr/libdata/perl/5.6.0/mach
-	cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
 	cd ${DESTDIR}/usr/share/locale; \
 	set - `cat ${.CURDIR}/locale.alias`; \
 	while [ $$# -gt 0 ] ; \
Index: mtree/BSD.root.dist
===================================================================
RCS file: /home/ncvs/src/etc/mtree/BSD.root.dist,v
retrieving revision 1.45
diff -u -r1.45 BSD.root.dist
--- mtree/BSD.root.dist	2000/02/25 14:18:48	1.45
+++ mtree/BSD.root.dist	2000/07/05 08:50:33
@@ -65,6 +65,7 @@
     ..
     sbin
     ..
+    sys             type=link link=/usr/src/sys
     tmp             mode=01777
     ..
     usr





To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message