# HG changeset patch
# User Franz Glasner <fzglas.hg@dom66.de>
# Date 1661077095 -7200
# Node ID eb95c986cc592129b3420561f4ae49a159525236
# Parent  6b7a084ddf1d0baca3f8d8906eb857508fcc238f
Use -t filesystem in all "zfs list" calls

diff -r 6b7a084ddf1d -r eb95c986cc59 sbin/fjail
--- a/sbin/fjail	Sun Aug 21 12:08:59 2022 +0200
+++ b/sbin/fjail	Sun Aug 21 12:18:15 2022 +0200
@@ -174,7 +174,7 @@
         echo "ERROR: no parent dataset given" >&2
         return 2
     fi
-    _pmp=$(zfs list -H -o mountpoint "${_pds}" 2>/dev/null) || { echo "ERROR: dataset \`${_pds}' does not exist" >&2; return 1; }
+    _pmp=$(zfs list -H -o mountpoint -t filesystem "${_pds}" 2>/dev/null) || { echo "ERROR: dataset \`${_pds}' does not exist" >&2; return 1; }
     case "${_pmp}" in
         none)
             echo "ERROR: dataset \`${_pds}' has no mountpoint" >&2
@@ -195,7 +195,7 @@
     fi
     _ds="${_pds}/${_cds}"
     echo "Resulting new root dataset is \`${_ds}' at mountpoint \`${_pmp}/${_cds}'"
-    if zfs list -H -o mountpoint "${_ds}" >/dev/null 2>/dev/null; then
+    if zfs list -H -o mountpoint -t filesystem "${_ds}" >/dev/null 2>/dev/null; then
         echo "ERROR: dataset \`${_ds}' does already exist" >&2
         return 1
     fi
@@ -496,7 +496,7 @@
     _vestatus=""
     _veds="$(_get_dataset_for_varempty "${_mp}")"
     if [ $? -eq 0 ]; then
-        _vestatus=$(zfs list -H -o readonly ${_veds} 2>/dev/null) || { echo "ERROR: cannot determine readonly status of ${_mp}/var/empty" >&2; return 1; }
+        _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
             zfs set readonly=off ${_veds} 1> /dev/null || { echo "ERROR: cannot reset readonly-status of ${_mp}/var/empty" >&2; return 1; }
         fi