From owner-svn-src-head@FreeBSD.ORG Thu Nov 22 04:50:42 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 908ED9F3;
Thu, 22 Nov 2012 04:50:42 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 7601C8FC13;
Thu, 22 Nov 2012 04:50:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAM4ogNA096217;
Thu, 22 Nov 2012 04:50:42 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAM4ogF5096216;
Thu, 22 Nov 2012 04:50:42 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201211220450.qAM4ogF5096216@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Thu, 22 Nov 2012 04:50:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r243392 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Thu, 22 Nov 2012 04:50:42 -0000
Author: sjg
Date: Thu Nov 22 04:50:42 2012
New Revision: 243392
URL: http://svnweb.freebsd.org/changeset/base/243392
Log:
INSTALL_AS_USER: output of id -un will never match 0 so use id -u
and USER for BINOWN etc.
Approved by: marcel (mentor)
Modified:
head/share/mk/bsd.own.mk
Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk Thu Nov 22 04:17:32 2012 (r243391)
+++ head/share/mk/bsd.own.mk Thu Nov 22 04:50:42 2012 (r243392)
@@ -678,11 +678,14 @@ CTFCONVERT_CMD= @:
.endif
.if ${MK_INSTALL_AS_USER} != "no"
-_uid!= id -un
+_uid!= id -u
.if ${_uid} != 0
+.if !defined(USER)
+USER!= id -un
+.endif
_gid!= id -gn
.for x in BIN CONF DOC INFO KMOD LIB MAN NLS SHARE
-$xOWN= ${_uid}
+$xOWN= ${USER}
$xGRP= ${_gid}
.endfor
.endif