The branch stable/15 has been updated by michaelo:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=221a5fb331e104a1becb67090ef8ee843cbce1d7

commit 221a5fb331e104a1becb67090ef8ee843cbce1d7
Author:     Michael Osipov <micha...@freebsd.org>
AuthorDate: 2025-08-31 10:10:48 +0000
Commit:     Michael Osipov <micha...@freebsd.org>
CommitDate: 2025-09-17 20:29:50 +0000

    bsdinstall: Drop outdated comments about ZFS dataset compression
    
    All datasets on zroot pool are compressed by default since FreeBSD 11.0 [1],
    no need to mention that on some specific datasets these days.
    
    [1] 47206692f2cca020891d1eec5028e02c3e6f56c5
    
    Reviewed by:    jrm (mentor), ziaee
    MFC after:      3 days
    Differential Revision:   https://reviews.freebsd.org/D52304
    
    (cherry picked from commit f304c5bb8be65df83b86f8a50e1c7982b266262d)
---
 usr.sbin/bsdinstall/bsdinstall.8    | 4 ++--
 usr.sbin/bsdinstall/scripts/zfsboot | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8
index 181abdcf9d05..5ccbaef87835 100644
--- a/usr.sbin/bsdinstall/bsdinstall.8
+++ b/usr.sbin/bsdinstall/bsdinstall.8
@@ -693,7 +693,7 @@ is:
 # Home directories separated so they are common to all BEs
 /home          mountpoint=/home
 
-# Compress /tmp, allow exec but not setuid
+# Create /tmp and allow exec but not setuid
 /tmp           mountpoint=/tmp,exec=on,setuid=off
 
 # Do not mount /usr so that 'base' files go to the BEROOT
@@ -702,7 +702,7 @@ is:
 # Ports tree
 /usr/ports     setuid=off
 
-# Source tree (compressed)
+# Source tree
 /usr/src
 
 # Create /var and friends
diff --git a/usr.sbin/bsdinstall/scripts/zfsboot 
b/usr.sbin/bsdinstall/scripts/zfsboot
index a3c1e2ddb89f..aa05faa7d3dd 100755
--- a/usr.sbin/bsdinstall/scripts/zfsboot
+++ b/usr.sbin/bsdinstall/scripts/zfsboot
@@ -152,7 +152,7 @@ f_isset ZFSBOOT_DATASETS || ZFSBOOT_DATASETS="
        # Home directories separated so they are common to all BEs
        /home           mountpoint=/home
 
-       # Compress /tmp, allow exec but not setuid
+       # Create /tmp and allow exec but not setuid
        /tmp            mountpoint=/tmp,exec=on,setuid=off
 
        # Don't mount /usr so that 'base' files go to the BEROOT
@@ -161,7 +161,7 @@ f_isset ZFSBOOT_DATASETS || ZFSBOOT_DATASETS="
        # Ports tree
        /usr/ports      setuid=off
 
-       # Source tree (compressed)
+       # Source tree
        /usr/src
 
        # Create /var and friends

Reply via email to