From nobody Tue May 23 12:24:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QQYQm2kJCz4CQlv; Tue, 23 May 2023 12:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QQYQm1zWBz3lPW; Tue, 23 May 2023 12:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684844656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P8sGn3GDXgUjtP7vkCimGZkE0VYcVNhb053IGkT1xi8=; b=tocU4q7gADKgEXllCY1jttbFKUFtS+O5H7eRepAPAyzo730+Jk4IYM0fBB2i14XZz7E83w Hu7KRbtNcr8uLLcSx+XqKNGUhfuIL/ALh8/I9LTXUZ8wrBqR0jDDtNCEITcQQyljap+lwW FZkXyYfhS9BWNOw12j4aJQeTUhWAsBANuElQWoiJvakH5EcV/3m+G3NCdZkw0sk+75Gqz0 jSN/zfCf724Be7U/Fud4jr6BmyP7YaAOruCAA8fqEZWzYXFAn6TxawaExgp2ulBJx7ua/u +5dQ3NoNjMqePy8U0VF6YR9JFUjfEH9R5wX8hYoyFTN+52CVrgcJ8sdzoMdI2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684844656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P8sGn3GDXgUjtP7vkCimGZkE0VYcVNhb053IGkT1xi8=; b=iO3jxJp1slqAfvleoGtwJJsJYaQieho9yffL44rxbTh+HUcI44q33z/OIIn2P6f6uplvSX 9Vka+FuSHXPnzZgPiKiAOGeaGceC1zf6wAYtqEdXfJzRk5+nN2Sq19lTi8pifpgrpVILbf HawGghNNTtkrb1zRBlCSFvqOSKzcOiHa1G/1+EQeddM9O2Tj6gcnzpDle2oGfNNz3Q7ovO D3AkGr7Br0kOA9Vr+tsExvivPWopAheQ6NbJrdhKs5KNWs9HKAWRaOS0nLP8R7eUr/ISnO q+GZcDLUkMGLAjcApEdBYs4SjLdF5xc6hFj94wtrOLNQtKaZGOfah6jWakjRdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684844656; a=rsa-sha256; cv=none; b=K6Bknln5d67rLMwbGS8OcwoZSxCC/Zuy5o0AuyfB6Ibl0bE7Vy+eurOZ0cOqOuaGjYozbH d8YfxaNUdkR1uzPjNt9QuZhEt8e99c50oxWLG55UB9yOnDQ1yl96rjPNtAUXGUxyh1ZjcX tG0RyvmHt912HssZ6sJCIUqohkz/N1DNjtGxWr/mOdKi605BcErEgNULyPoZEy2l4PHaPb zRDmWNgRN7IRoPGEwe6LO3/D5A4iJ587zD9US4NGsi9f+/c1m1RZ5DsvsuQBGBwI3z33+2 a3lksO5TwJinWkQKD37a8Txt7anE9jSU3HcQhTAz1HkIXlaFpb4ttYEIPDdEjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QQYQm137fz10df; Tue, 23 May 2023 12:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34NCOG7R017557; Tue, 23 May 2023 12:24:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34NCOGA6017556; Tue, 23 May 2023 12:24:16 GMT (envelope-from git) Date: Tue, 23 May 2023 12:24:16 GMT Message-Id: <202305231224.34NCOGA6017556@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: 3bb92304b4fe - main - bsdinstall on zfs: create dataset for /home rather than /usr/home List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3bb92304b4fe79babd19ba0d9c74d29af9117a22 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=3bb92304b4fe79babd19ba0d9c74d29af9117a22 commit 3bb92304b4fe79babd19ba0d9c74d29af9117a22 Author: Mike Karels AuthorDate: 2023-05-23 12:18:27 +0000 Commit: Mike Karels CommitDate: 2023-05-23 12:18:27 +0000 bsdinstall on zfs: create dataset for /home rather than /usr/home 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 --- usr.sbin/bsdinstall/bsdinstall.8 | 8 ++++---- usr.sbin/bsdinstall/scripts/zfsboot | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8 index b76cdc04b9c3..edeeffa5f634 100644 --- a/usr.sbin/bsdinstall/bsdinstall.8 +++ b/usr.sbin/bsdinstall/bsdinstall.8 @@ -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 @@ -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 diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index c40a9484c8c4..c2d42f830a73 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -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