From owner-svn-src-head@FreeBSD.ORG  Mon Jun 15 21:05:00 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A8C741065678;
	Mon, 15 Jun 2009 21:05:00 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 95B2A8FC2A;
	Mon, 15 Jun 2009 21:05:00 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5FL50iB001951;
	Mon, 15 Jun 2009 21:05:00 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5FL50Ju001949;
	Mon, 15 Jun 2009 21:05:00 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200906152105.n5FL50Ju001949@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Mon, 15 Jun 2009 21:05:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194266 - head/usr.bin/chpass
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Jun 2009 21:05:02 -0000

Author: ed
Date: Mon Jun 15 21:05:00 2009
New Revision: 194266
URL: http://svn.freebsd.org/changeset/base/194266

Log:
  Make the chpass Makefile honour NO_FSCHG.
  
  The chpass Makefile tried to set the fschg flag on the binaries, even if
  NO_FSCHG was passed to the installworld. This meant that if I installed
  FreeBSD into a Jail, I couldn't installworld from within the Jail
  anymore.
  
  Now that it listens to NO_FSCHG, we can just make it bail out when it
  fails, just like PRECIOUSPROG does.

Modified:
  head/usr.bin/chpass/Makefile

Modified: head/usr.bin/chpass/Makefile
==============================================================================
--- head/usr.bin/chpass/Makefile	Mon Jun 15 21:03:25 2009	(r194265)
+++ head/usr.bin/chpass/Makefile	Mon Jun 15 21:05:00 2009	(r194266)
@@ -39,11 +39,12 @@ MLINKS+= chpass.1 ypchpass.1 chpass.1 yp
 
 beforeinstall:
 .for i in chpass chfn chsh ypchpass ypchfn ypchsh
-	[ ! -e ${DESTDIR}${BINDIR}/$i ] || \
-		chflags noschg ${DESTDIR}${BINDIR}/$i || true
+	-chflags noschg ${DESTDIR}${BINDIR}/$i
 .endfor
 
+.if !defined(NO_FSCHG)
 afterinstall:
-	-chflags schg ${DESTDIR}${BINDIR}/chpass
+	chflags schg ${DESTDIR}${BINDIR}/chpass
+.endif
 
 .include <bsd.prog.mk>