svn commit: r283895 - head/release/tools
Glen Barber
gjb at FreeBSD.org
Mon Jun 1 20:59:19 UTC 2015
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
More information about the svn-src-head
mailing list