From owner-cvs-src@FreeBSD.ORG  Wed Jan 28 12:42:28 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 161D016A4CE
	for <cvs-src@FreeBSD.org>; Wed, 28 Jan 2004 12:42:28 -0800 (PST)
Received: from smtp.mho.com (smtp.mho.net [64.58.4.6])
	by mx1.FreeBSD.org (Postfix) with SMTP id 4F0C443D46
	for <cvs-src@FreeBSD.org>; Wed, 28 Jan 2004 12:42:20 -0800 (PST)
	(envelope-from scottl@freebsd.org)
Received: (qmail 46666 invoked by uid 1002); 28 Jan 2004 20:42:17 -0000
Received: from unknown (HELO ?10.4.1.5?) (64.58.1.252)
  by smtp.mho.net with SMTP; 28 Jan 2004 20:42:17 -0000
Date: Wed, 28 Jan 2004 14:49:31 -0700 (MST)
From: Scott Long <scottl@freebsd.org>
X-X-Sender: scottl@pooker.samsco.home
To: Ruslan Ermilov <ru@FreeBSD.org>
In-Reply-To: <20040128203513.GD11253@FreeBSD.org.ua>
Message-ID: <20040128144715.C11120@pooker.samsco.home>
References: <200401281929.i0SJTGIP043858@repoman.freebsd.org>
	<20040128202822.GA77881@dragon.nuxi.com>
	<20040128203513.GD11253@FreeBSD.org.ua>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: cvs-all@FreeBSD.org
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: Poul-Henning Kamp <phk@FreeBSD.org>
cc: David O'Brien <obrien@FreeBSD.org>
Subject: Re: cvs commit: src/sbin/disklabel Makefile disklabel.5 disklabel.8
 disklabel.c pathnames.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jan 2004 20:42:28 -0000

On Wed, 28 Jan 2004, Ruslan Ermilov wrote:
> On Wed, Jan 28, 2004 at 12:28:22PM -0800, David O'Brien wrote:
> > On Wed, Jan 28, 2004 at 10:19:28PM +0200, Ruslan Ermilov wrote:
> > > Index: Makefile
> > > ===================================================================
> > > RCS file: /home/ncvs/src/sbin/bsdlabel/Makefile,v
> > > retrieving revision 1.19
> > > diff -u -r1.19 Makefile
> > ...
> > > +afterinstall:
> > > +.if exists(${DESTDIR}${BINDIR}/disklabel)
> > > +	rm -f ${DESTDIR}${BINDIR}/disklabel
> > > +.endif
> >
> > This is wrong -- ${BINDIR}/disklabel is a link to {bsd,sun}label.
> >
> Perhaps you didn't notice that, but the trimmed part of the patch
> also removes the compatibility link from disklabel to bsdlabel.
>
> The disklabel is not linked to sunlabel since 2003/04/23.
>

Do not remove the compatibility link.  We can debate whether or not it
should point to sunlabel (I think that it should, on the appropriate
ARCH), but it should not be removed.

Scott