From 043d779d9b297a81ab075e0a844aeaee92be1765 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Fri, 5 Jun 2015 02:22:04 +0000
Subject: [PATCH] Work around a potential bug in pw(8) when '-m' is specified.
 According to the manual page, '-m' should create the user home directory,
 however rigorous testing suggests it does not, and it is unclear if this is
 an implementation or expectation issue.

Sponsored by:	The FreeBSD Foundation
---
 release/tools/arm.subr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index 3f5825966749..564d9b66b1db 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -82,7 +82,7 @@ arm_create_user() {
 	# and set the default password for the 'root' user to 'root'.
 	chroot ${CHROOTDIR} /usr/sbin/pw -R ${DESTDIR} \
 		groupadd freebsd -g 1001
-	chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/home
+	chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/home/freebsd
 	chroot ${CHROOTDIR} /usr/sbin/pw -R ${DESTDIR} \
 		useradd freebsd \
 		-m -M 0755 -w yes -n freebsd -u 1001 -g 1001 -G 0 \