From owner-svn-src-all@FreeBSD.ORG  Mon Jun  1 20:59:19 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2B19D369;
 Mon,  1 Jun 2015 20:59:19 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1991F1749;
 Mon,  1 Jun 2015 20:59:19 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t51KxISq015757;
 Mon, 1 Jun 2015 20:59:18 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t51KxINk015756;
 Mon, 1 Jun 2015 20:59:18 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201506012059.t51KxINk015756@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 1 Jun 2015 20:59:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r283895 - head/release/tools
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Jun 2015 20:59:19 -0000

Author: gjb
Date: Mon Jun  1 20:59:18 2015
New Revision: 283895
URL: https://svnweb.freebsd.org/changeset/base/283895

Log:
  Re-enable arm_create_user(), and pass the '-V DESTDIR/etc' to
  pw(8) to set the correct /etc directory for the user/group
  files.
  
  Provided by:	ian (thanks!)
  MFC after:	3 days
  X-MFC-with:	r283894
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/tools/arm.subr

Modified: head/release/tools/arm.subr
==============================================================================
--- head/release/tools/arm.subr	Mon Jun  1 20:26:38 2015	(r283894)
+++ head/release/tools/arm.subr	Mon Jun  1 20:59:18 2015	(r283895)
@@ -80,11 +80,14 @@ arm_create_disk() {
 arm_create_user() {
 	# Create a default user account 'freebsd' with the password 'freebsd',
 	# and set the default password for the 'root' user to 'root'.
-	chroot ${CHROOTDIR} /usr/sbin/pw groupadd freebsd -g 1001
-	chroot ${CHROOTDIR} /usr/sbin/pw useradd freebsd \
+	chroot ${CHROOTDIR} /usr/sbin/pw -V ${DESTDIR}/etc \
+		groupadd freebsd -g 1001
+	chroot ${CHROOTDIR} /usr/sbin/pw -V ${DESTDIR}/etc \
+		useradd freebsd \
 		-m -M 0755 -w yes -n freebsd -u 1001 -g 1001 -G 0 \
 		-c 'FreeBSD User' -d '/home/freebsd' -s '/bin/csh'
-	chroot ${CHROOTDIR} /usr/sbin/pw usermod root -w yes
+	chroot ${CHROOTDIR} /usr/sbin/pw -V ${DESTDIR}/etc \
+		usermod root -w yes
 
 	return 0
 }
@@ -98,7 +101,7 @@ arm_install_base() {
 		installworld installkernel distribution
 	chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/msdos
 
-	#arm_create_user
+	arm_create_user
 
 	echo '# Custom /etc/fstab for FreeBSD embedded images' \
 		> ${CHROOTDIR}/${DESTDIR}/etc/fstab