# HG changeset patch # User Franz Glasner # Date 1662758000 -7200 # Node ID 04fde19419669b8abc9213b0d7d545f04ead1cfa # Parent 23f37702a502d828e09279849e6793c2025496ad Remove unneeded code from copying from fjail diff -r 23f37702a502 -r 04fde1941966 sbin/ftjail --- a/sbin/ftjail Fri Sep 09 21:48:29 2022 +0200 +++ b/sbin/ftjail Fri Sep 09 23:13:20 2022 +0200 @@ -212,55 +212,6 @@ command_datasets_tmpl_base "${_p_base}" "${_name}" || return command_datasets_tmpl_skel "${_p_skel}" "${_name}" || return return 0 - - # - # NOTE: For BEs these directory will be *excluded* from the BE - # - # /tmp - # /usr/home - # /usr/ports - # /usr/src - # /var/audit - # /var/crash - # /var/log - # /var/mail - # /var/tmp - # - zfs create ${_zfsopts} ${_zfsnoauto} -o atime=off "${_ds}" - zfs create ${_zfsopts} ${_zfsnoauto} -o sync=disabled -o setuid=off "${_ds}/tmp" - if [ "${_tiny}" != "extra" ]; then - if [ "${_tiny}" = "yes" ]; then - zfs create ${_zfsopts} -o canmount=off "${_ds}/usr" - else - zfs create ${_zfsopts} ${_zfsnoauto} "${_ds}/usr" - fi - zfs create ${_zfsopts} ${_zfsnoauto} -o setuid=off "${_ds}/usr/home" - zfs create ${_zfsopts} ${_zfsnoauto} "${_ds}/usr/local" - fi - if [ \( "${_tiny}" = "yes" \) -o \( "${_tiny}" = "extra" \) ]; then - zfs create ${_zfsopts} -o canmount=off "${_ds}/var" - else - zfs create ${_zfsopts} ${_zfsnoauto} "${_ds}/var" - fi - if [ "${_tiny}" != "extra" ]; then - zfs create ${_zfsopts} ${_zfsnoauto} -o exec=off -o setuid=off "${_ds}/var/audit" - zfs create ${_zfsopts} ${_zfsnoauto} -o exec=off -o setuid=off "${_ds}/var/cache" - zfs create ${_zfsopts} ${_zfsnoauto} -o exec=off -o setuid=off -o primarycache=metadata -o compression=off "${_ds}/var/cache/pkg" - zfs create ${_zfsopts} ${_zfsnoauto} -o exec=off -o setuid=off -o compression=off "${_ds}/var/crash" - fi - if [ "$_fbsdupdate" = "yes" ]; then - if [ \( "${_tiny}" = "yes" \) -o \( "${_tiny}" = "extra" \) ]; then - zfs create ${_zfsopts} -o canmount=off -o exec=off -o setuid=off "${_ds}/var/db" - else - zfs create ${_zfsopts} ${_zfsnoauto} -o exec=off -o setuid=off "${_ds}/var/db" - fi - zfs create ${_zfsopts} ${_zfsnoauto} -o exec=off -o setuid=off -o primarycache=metadata -o compression=off "${_ds}/var/db/freebsd-update" - fi - zfs create ${_zfsopts} ${_zfsnoauto} ${_varempty_ro} -o exec=off -o setuid=off "${_ds}/var/empty" - zfs create ${_zfsopts} ${_zfsnoauto} -o exec=off -o setuid=off -o primarycache=metadata "${_ds}/var/log" - zfs create ${_zfsopts} ${_zfsnoauto} -o exec=off -o setuid=off -o atime=on "${_ds}/var/mail" - zfs create ${_zfsopts} ${_zfsnoauto} -o sync=disabled -o exec=off -o setuid=off -o compression=off -o primarycache=all "${_ds}/var/run" - zfs create ${_zfsopts} ${_zfsnoauto} -o sync=disabled -o setuid=off "${_ds}/var/tmp" }