diff options
Diffstat (limited to 'zfs-pivy.hook')
| -rw-r--r-- | zfs-pivy.hook | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zfs-pivy.hook b/zfs-pivy.hook index 6a01766ff03a..b5b8b75f2cb0 100644 --- a/zfs-pivy.hook +++ b/zfs-pivy.hook @@ -105,7 +105,7 @@ zfs_mount_handler () { mountpoint=$(zfs get -H -o value mountpoint "${dataset}") canmount=$(zfs get -H -o value canmount "${dataset}") # skip dataset - [ ${canmount} = "off" -o ${mountpoint} = "none" ] && continue + [ ${dataset} != "${ZFS_DATASET}" -a \( ${canmount} = "off" -o ${canmount} = "noauto" -o ${mountpoint} = "none" \) ] && continue if [ ${mountpoint} = "legacy" ]; then if [ -f "${tab_file}" ]; then if findmnt -snero source -F "${tab_file}" -S "${dataset}" > /dev/null 2>&1; then @@ -152,7 +152,7 @@ run_hook() { pcscd_pid= } msg ":: waiting for smartcard devices..." - sleep 5 + sleep 5 udevadm trigger & sleep 1 pcscd --hotplug |