svn commit: r285115 - stable/10/release/tools

[Glen Barber]

Author: gjb
Date: Sat Jul  4 00:43:23 2015
New Revision: 285115
URL: https://svnweb.freebsd.org/changeset/base/285115

Log:
  MFC r284004 (parital):
   Use the pw(8) '-R' flag to change the relative root directory
   when creating operating within the DESTDIR.
  
  Approved by:	re (marius)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/tools/arm.subr
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/tools/arm.subr
==============================================================================
--- stable/10/release/tools/arm.subr	Sat Jul  4 00:01:41 2015	(r285114)
+++ stable/10/release/tools/arm.subr	Sat Jul  4 00:43:23 2015	(r285115)
@@ -80,15 +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 -V ${DESTDIR}/etc \
+	chroot ${CHROOTDIR} /usr/sbin/pw -R ${DESTDIR} \
 		groupadd freebsd -g 1001
 	chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/home/freebsd
-	chroot ${CHROOTDIR} /usr/sbin/pw -V ${DESTDIR}/etc \
+	chroot ${CHROOTDIR} /usr/sbin/pw -R ${DESTDIR} \
 		useradd freebsd \
 		-m -M 0755 -w yes -n freebsd -u 1001 -g 1001 -G 0 \
-		-c 'FreeBSD User' -d '/home/freebsd' -s '/bin/csh' \
-		-b "${DESTDIR}/home"
-	chroot ${CHROOTDIR} /usr/sbin/pw -V ${DESTDIR}/etc \
+		-c 'FreeBSD User' -d '/home/freebsd' -s '/bin/csh'
+	chroot ${CHROOTDIR} /usr/sbin/pw -R ${DESTDIR} \
 		usermod root -w yes
 
 	return 0