Skip to content

Commit

Permalink
bsdinstall on zfs: create dataset for /home rather than /usr/home
Browse files Browse the repository at this point in the history
Now that pw (hence adduser and the initial install) use /home for
user home directories rather than /usr/home, create a dataset for
/home rather than /usr/home.  Update the man page to match.

Reviewed by:	rgrimes, markj
Differential Revision:	https://reviews.freebsd.org/D40086
  • Loading branch information
Mike Karels authored and Mike Karels committed May 23, 2023
1 parent bbb2d2c commit 3bb9230
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions usr.sbin/bsdinstall/bsdinstall.8
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ Provides a ZFS-only automatic interactive disk partitioner.
Creates a single
.Ic zpool
with separate datasets for
.Pa /home ,
.Pa /tmp ,
.Pa /usr ,
.Pa /usr/home ,
.Pa /usr/ports ,
.Pa /usr/src ,
and
Expand Down Expand Up @@ -598,15 +598,15 @@ is:
/$ZFSBOOT_BEROOT_NAME mountpoint=none
/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME mountpoint=/

# Home directories separated so they are common to all BEs
/home mountpoint=/home

# Compress /tmp, allow exec but not setuid
/tmp mountpoint=/tmp,exec=on,setuid=off

# Do not mount /usr so that 'base' files go to the BEROOT
/usr mountpoint=/usr,canmount=off

# Home directories separated so they are common to all BEs
/usr/home # NB: /home is a symlink to /usr/home

# Ports tree
/usr/ports setuid=off

Expand Down
6 changes: 3 additions & 3 deletions usr.sbin/bsdinstall/scripts/zfsboot
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,15 @@ f_isset ZFSBOOT_DATASETS || ZFSBOOT_DATASETS="
/$ZFSBOOT_BEROOT_NAME mountpoint=none
/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME mountpoint=/
# Home directories separated so they are common to all BEs
/home mountpoint=/home
# Compress /tmp, allow exec but not setuid
/tmp mountpoint=/tmp,exec=on,setuid=off
# Don't mount /usr so that 'base' files go to the BEROOT
/usr mountpoint=/usr,canmount=off
# Home directories separated so they are common to all BEs
/usr/home # NB: /home is a symlink to /usr/home
# Ports tree
/usr/ports setuid=off
Expand Down

0 comments on commit 3bb9230

Please sign in to comment.