diff options
| author | gjb <gjb@FreeBSD.org> | 2015-07-04 00:43:23 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-07-04 00:43:23 +0000 |
| commit | 17ec25ba4e3c94534abe39fbca2f6e36cdc3be3a (patch) | |
| tree | 5d28d5d61b3b2c9c84857ac5401cddfb548eaa53 /release/tools | |
| parent | 63c8b34326e946ad9b25e3cc6980b9b0f3329847 (diff) | |
| download | FreeBSD-src-17ec25ba4e3c94534abe39fbca2f6e36cdc3be3a.zip FreeBSD-src-17ec25ba4e3c94534abe39fbca2f6e36cdc3be3a.tar.gz | |
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
Diffstat (limited to 'release/tools')
| -rw-r--r-- | release/tools/arm.subr | 9 |
1 files changed, 4 insertions, 5 deletions
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 |
