From 17ec25ba4e3c94534abe39fbca2f6e36cdc3be3a Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Sat, 4 Jul 2015 00:43:23 +0000
Subject: 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
---
 release/tools/arm.subr | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'release/tools')

diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index c350a41..564d9b6 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -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
-- 
cgit v1.1