Mercurial > hgrepos > FreeBSD > ports > sysutils > local-bsdtools

changeset 445:0159c8453fa2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename recently moved functions: _get_dataset... -> _get_zfs_dataset...
author Franz Glasner <fzglas.hg@dom66.de>
date Mon, 06 May 2024 09:32:14 +0200
parents 84e43d1bd128
children 0c95a5b279cf
files sbin/fjail share/local-bsdtools/common.subr
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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 <mountpoint>/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}"
 }