--- a/sbin/fjail	Sat Sep 17 16:29:17 2022 +0200
+++ b/sbin/fjail	Sat Sep 17 16:47:32 2022 +0200
@@ -41,21 +41,13 @@
     -T        Create only an extra tiny set of datasets
     -u        Do not automatically mount newly created datasets
 
-  mount [-O] [-u] [-n] DATASET [MOUNTPOINT]
+  mount
 
-    Mount the ZFS dataset DATASET and all its children to mountpoint
-    MOUNTPOINT
+    See sibling tool `fzfs'"'"'
 
-    -O        Also mount datasets at mountpoints outside of their "natural"
-              and inherited mountpoints
-    -N        Mount at their "natural" configured ZFS mountpoints (MOUNTPOINT is not required)
-    -P        Do not mount the given prent DATASET but only its children
-    -n        Do not really mount but show what would be mounted where
-    -u        Alias of -n
+  umount
 
-  umount DATASET
-
-    Unmount the mounted DATASET and all its children
+    See sibling tool `fzfs'"'"'
 
   privs MOUNTPOINT
 
@@ -490,172 +482,6 @@
 
 
 #
-# "mount" -- recursively mount a dataset including subordinate datasets
-#
-# command_mount dataset mountpoint
-#
-command_mount() {
-    local _dsname _mountpoint
-    local _name _mp _canmount _mounted
-    local _rootds_mountpoint _relative_mp _real_mp
-    local _dry_run _mount_outside _mount_natural _mount_children_only
-
-    _dry_run=""
-    _mount_outside=""
-    _mount_natural=""
-    _mount_children_only=""
-    while getopts "ONPnu" _opt ; do
-        case ${_opt} in
-            O)
-                _mount_outside="yes"
-                ;;
-            N)
-                _mount_natural="yes"
-                ;;
-            P)
-                _mount_children_only="yes"
-                ;;
-            n|u)
-                _dry_run="yes"
-                ;;
-            \?|:)
-                return 2;
-                ;;
-        esac
-    done
-    shift $((OPTIND-1))
-    OPTIND=1
-
-    _dsname="${1-}"
-    _mountpoint="${2-}"
-
-    if [ -z "${_dsname}" ]; then
-        echo "ERROR: no dataset given" >&2
-        return 2
-    fi
-
-    _rootds_mountpoint="$(zfs list -H -o mountpoint -t filesystem "${_dsname}")"  || \
-        { echo "ERROR: root dataset does not exist" >&2; return 1; }
-
-    if [ -z "${_mountpoint}" ]; then
-        if [ "${_mount_natural}" = "yes" ]; then
-            _mountpoint="${_rootds_mountpoint}"
-        else
-            echo "ERROR: no mountpoint given" >&2
-            return 2
-        fi
-    else
-        if [ "${_mount_natural}" = "yes" ]; then
-            echo "ERROR: Cannot have a custom mountpoint when \"-O\" is given" >&2
-            return 2
-        fi
-    fi
-
-    # Eventually remove a trailing slash
-    _mountpoint="${_mountpoint%/}"
-    if [ -z "${_mountpoint}" ]; then
-        echo "ERROR: would mount over the root filesystem" >&2
-        return 1
-    fi
-
-    zfs list -H -o name,mountpoint,canmount,mounted -s mountpoint -t filesystem -r "${_dsname}" \
-    | {
-        while IFS=$'\t' read -r _name _mp _canmount _mounted ; do
-            # Skip filesystems that are already mounted
-            [ "${_mounted}" = "yes" ] && continue
-            # Skip filesystems that must not be mounted
-            [ "${_canmount}" = "off" ] && continue
-            # Mount only the children and skip the given dataset it required
-            [ \( "${_mount_children_only}" = "yes" \) -a \( "${_name}" = "${_dsname}" \) ] && continue
-            case "${_mp}" in
-                "none"|"legacy")
-                    # Do nothing for filesystem with unset or legacy mountpoints
-                    ;;
-                "${_rootds_mountpoint}"|"${_rootds_mountpoint}/"*)
-                    #
-                    # Handle only mountpoints that have a mountpoint below
-                    # the parent datasets mountpoint
-                    #
-
-                    # Determine the mountpoint relative to the parent mountpoint
-                    _relative_mp="${_mp#${_rootds_mountpoint}}"
-                    # Eventually remove a trailing slash
-                    _relative_mp="${_relative_mp%/}"
-                    # The real effective full mountpoint
-                    _real_mp="${_mountpoint}${_relative_mp}"
-
-                    #
-                    # Consistency and sanity check: computed real mountpoint must
-                    # be equal to the configured mountpoint when no custom mountpoint
-                    # is given.
-                    #
-                    if [ "${_mount_natural}" = "yes" ]; then
-                        if [ "${_real_mp}" != "${_mp}" ]; then
-                            echo "ERROR: mountpoint mismatch" >&2
-                            return 1
-                        fi
-                    fi
-
-                    if [ "${_dry_run}" = "yes" ]; then
-                        echo "Would mount ${_name} on ${_real_mp}"
-                    else
-                        mkdir -p "${_real_mp}" 1> /dev/null 2> /dev/null || \
-                            { echo "ERROR: cannot create mountpoint ${_real_mp}" >&2; return 1; }
-                        echo "Mounting ${_name} on ${_real_mp}"
-                        mount -t zfs "${_name}" "${_real_mp}" || return 1
-                    fi
-                    ;;
-                *)
-                    if [ "${_mount_outside}" = "yes" ]; then
-                        if [ "${_dry_run}" = "yes" ]; then
-                            echo "Would mount ${_name} on configured ZFS dataset mountpoint ${_mp}"
-                        else
-                            echo "Mounting ${_name} on configured ZFS dataset mountpoint ${_mp}"
-                            zfs mount "${_name}" || return 1
-                        fi
-                    else
-                        echo "Skipping ${_name} because its configured ZFS mountpoint is not relative to given root dataset" 2>&1
-                    fi
-                    ;;
-            esac
-        done
-
-        return 0
-    }
-}
-
-
-#
-# "umount" -- Recursively unmount ZFS datasets
-#
-# command_umount dataset
-#
-command_umount() {
-    local _dsname
-    local _name _mp _rest
-    local _rootds_mountpoint
-
-    _dsname="${1-}"
-    [ -z "${_dsname}" ] && \
-        { echo "ERROR: no dataset given" >&2; return 2; }
-
-    # Just determine whether the given dataset name exists
-    _rootds_mountpoint="$(zfs list -H -o mountpoint -t filesystem "${_dsname}")" || { echo "ERROR: dataset not found" >&2; return 1; }
-
-    mount -t zfs -p \
-    | grep -E "^${_dsname}(/|\s)" \
-    | sort -n -r \
-    | {
-        while IFS=' '$'\t' read -r _name _mp _rest ; do
-            echo "Umounting ${_name} on ${_mp}"
-            umount "${_mp}" || return 1
-        done
-        return 0
-    }
-}
-
-
-#
 # "privs" -- adjust privileges
 #
 # To be used when all ZFS datasets are mounted.
@@ -741,10 +567,10 @@
         command_datasets "$@"
         ;;
     mount)
-        command_mount "$@"
+        exec "$(dirname $0)/fzfs" mount "$@"
         ;;
     umount|unmount)
-        command_umount "$@"
+        exec "$(dirname $0)/fzfs" umount "$@"
         ;;
     privs)
         command_privs "$@"