comparison sbin/fjail @ 182:dbd62c32b3fd

FIX: Do expansion then comparing
author Franz Glasner <hg@dom66.de>
date Tue, 16 Aug 2022 12:45:38 +0200
parents d30a68e66d60
children ea491007d7fb
comparison
equal deleted inserted replaced
181:d30a68e66d60 182:dbd62c32b3fd
203 # /var/mail 203 # /var/mail
204 # /var/tmp 204 # /var/tmp
205 # 205 #
206 zfs create ${_zfsopts} -o atime=off "${_ds}" 206 zfs create ${_zfsopts} -o atime=off "${_ds}"
207 zfs create ${_zfsopts} -o sync=disabled -o setuid=off "${_ds}/tmp" 207 zfs create ${_zfsopts} -o sync=disabled -o setuid=off "${_ds}/tmp"
208 if [ "{_tiny}" != "extra" ]; then 208 if [ "${_tiny}" != "extra" ]; then
209 if [ "${_tiny}" = "yes" ]; then 209 if [ "${_tiny}" = "yes" ]; then
210 zfs create ${_zfsopts} -o canmount=off "${_ds}/usr" 210 zfs create ${_zfsopts} -o canmount=off "${_ds}/usr"
211 else 211 else
212 zfs create ${_zfsopts} "${_ds}/usr" 212 zfs create ${_zfsopts} "${_ds}/usr"
213 fi 213 fi
214 zfs create ${_zfsopts} -o setuid=off "${_ds}/usr/home" 214 zfs create ${_zfsopts} -o setuid=off "${_ds}/usr/home"
215 zfs create ${_zfsopts} "${_ds}/usr/local" 215 zfs create ${_zfsopts} "${_ds}/usr/local"
216 fi 216 fi
217 if [ \( "${_tiny}" = "yes" \) -o \( "{_tiny}" = "extra" \) ]; then 217 if [ \( "${_tiny}" = "yes" \) -o \( "${_tiny}" = "extra" \) ]; then
218 zfs create ${_zfsopts} -o canmount=off "${_ds}/var" 218 zfs create ${_zfsopts} -o canmount=off "${_ds}/var"
219 else 219 else
220 zfs create ${_zfsopts} "${_ds}/var" 220 zfs create ${_zfsopts} "${_ds}/var"
221 fi 221 fi
222 if [ "${_tiny}" != "extra" ]; then 222 if [ "${_tiny}" != "extra" ]; then
224 zfs create ${_zfsopts} -o exec=off -o setuid=off "${_ds}/var/cache" 224 zfs create ${_zfsopts} -o exec=off -o setuid=off "${_ds}/var/cache"
225 zfs create ${_zfsopts} -o exec=off -o setuid=off -o primarycache=metadata -o compression=off "${_ds}/var/cache/pkg" 225 zfs create ${_zfsopts} -o exec=off -o setuid=off -o primarycache=metadata -o compression=off "${_ds}/var/cache/pkg"
226 zfs create ${_zfsopts} -o exec=off -o setuid=off -o compression=off "${_ds}/var/crash" 226 zfs create ${_zfsopts} -o exec=off -o setuid=off -o compression=off "${_ds}/var/crash"
227 fi 227 fi
228 if [ "$_fbsdupdate" = "yes" ]; then 228 if [ "$_fbsdupdate" = "yes" ]; then
229 if [ \( "${_tiny}" = "yes" \) -o \( "{_tiny}" = "extra" \) ]; then 229 if [ \( "${_tiny}" = "yes" \) -o \( "${_tiny}" = "extra" \) ]; then
230 zfs create ${_zfsopts} -o canmount=off -o exec=off -o setuid=off "${_ds}/var/db" 230 zfs create ${_zfsopts} -o canmount=off -o exec=off -o setuid=off "${_ds}/var/db"
231 else 231 else
232 zfs create ${_zfsopts} -o exec=off -o setuid=off "${_ds}/var/db" 232 zfs create ${_zfsopts} -o exec=off -o setuid=off "${_ds}/var/db"
233 fi 233 fi
234 zfs create ${_zfsopts} -o exec=off -o setuid=off -o primarycache=metadata -o compression=off "${_ds}/var/db/freebsd-update" 234 zfs create ${_zfsopts} -o exec=off -o setuid=off -o primarycache=metadata -o compression=off "${_ds}/var/db/freebsd-update"