# HG changeset patch # User Franz Glasner # Date 1714980734 -7200 # Node ID 0159c8453fa2bfbdc60569ea1a63e209bfbba9c2 # Parent 84e43d1bd128c71f9839c829a75b25bc45bfcef2 Rename recently moved functions: _get_dataset... -> _get_zfs_dataset... diff -r 84e43d1bd128 -r 0159c8453fa2 sbin/fjail --- a/sbin/fjail Mon May 06 09:14:41 2024 +0200 +++ b/sbin/fjail Mon May 06 09:32:14 2024 +0200 @@ -580,7 +580,7 @@ # make it writeable temporarily if it is mounted read-only: # _vestatus="" - _veds="$(_get_dataset_for_varempty "${_mp}")" + _veds="$(_get_zfs_dataset_for_varempty "${_mp}")" if [ $? -eq 0 ]; then _vestatus=$(zfs list -H -o readonly -t filesystem ${_veds} 2>/dev/null) || { echo "ERROR: cannot determine readonly status of ${_mp}/var/empty" >&2; return 1; } if [ "${_vestatus}" = "on" ]; then diff -r 84e43d1bd128 -r 0159c8453fa2 share/local-bsdtools/common.subr --- a/share/local-bsdtools/common.subr Mon May 06 09:14:41 2024 +0200 +++ b/share/local-bsdtools/common.subr Mon May 06 09:32:14 2024 +0200 @@ -74,7 +74,7 @@ } -_get_dataset_for_mountpoint() { +_get_zfs_dataset_for_mountpoint() { : 'Use `mount -t zfs -p` to determine the ZFS dataset for a given mountpoint. ' @@ -97,7 +97,7 @@ } -_get_dataset_for_varempty() { +_get_zfs_dataset_for_varempty() { : 'Allow special handling for /var/empty which may be mounted read-only. @@ -113,5 +113,5 @@ _ve_mount="${_mountpoint}/var/empty" fi - _get_dataset_for_mountpoint "${_ve_mount}" + _get_zfs_dataset_for_mountpoint "${_ve_mount}" }