From owner-freebsd-bugs  Sat Dec 15  0: 0:10 2001
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 2BD9C37B417
	for <freebsd-bugs@hub.freebsd.org>; Sat, 15 Dec 2001 00:00:02 -0800 (PST)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id fBF802P90115;
	Sat, 15 Dec 2001 00:00:02 -0800 (PST)
	(envelope-from gnats)
Received: from w250.z064001178.sjc-ca.dsl.cnc.net (w250.z064001178.sjc-ca.dsl.cnc.net [64.1.178.250])
	by hub.freebsd.org (Postfix) with SMTP id 62CE337B417
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 14 Dec 2001 23:58:14 -0800 (PST)
Received: (qmail 87284 invoked by uid 1000); 15 Dec 2001 07:58:35 -0000
Message-Id: <20011215075835.87283.qmail@lizzy.bugworks.com>
Date: 15 Dec 2001 07:58:35 -0000
From: Jos Backus <jos@cncdsl.com>
Reply-To: Jos Backus <josb@cncdsl.com>
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.113
Subject: bin/32850: Update of src/etc/mtree/BSD.usr.dist breaks mergemaster run
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-bugs.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-bugs>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-bugs>
X-Loop: FreeBSD.org


>Number:         32850
>Category:       bin
>Synopsis:       Update of src/etc/mtree/BSD.usr.dist breaks mergemaster run
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 15 00:00:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Jos Backus
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
none
>Environment:
System: FreeBSD lizzy.bugworks.com 5.0-CURRENT FreeBSD 5.0-CURRENT #12: Thu Dec 13 21:23:19 PST 2001 jos@lizzy.bugworks.com:/disk0/usr/obj/usr/src/sys/LIZZY i386


>Description:
	
	src/etc/mtree/BSD.usr.dist 1.244 forgets to add a ``..'' to properly
	create the hierarchy. This breaks the mergemaster run:

# mergemaster
[snip]
./vm missing (created)
cd /var/tmp/temproot/; rm -f /var/tmp/temproot/sys; ln -s usr/src/sys sys
cd /var/tmp/temproot/usr/share/man/en.ISO8859-1; ln -sf ../man* .
cd: can't cd to /var/tmp/temproot/usr/share/man/en.ISO8859-1
*** Error code 2

Stop in /usr/src/etc.

  *** FATAL ERROR: Cannot 'cd' to /usr/src/etc and install files to
      the temproot environment


>How-To-Repeat:

	Run mergemaster on today's current.

>Fix:

--- BSD.usr.dist.orig	Fri Dec 14 23:53:18 2001
+++ BSD.usr.dist	Fri Dec 14 23:57:39 2001
@@ -419,6 +419,7 @@
             ..
             smbfs
                 print
+		..
             ..
             startslip
             ..
>Release-Note:
>Audit-Trail:
>Unformatted:

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