diff --git a/docker/iscsiadm b/docker/iscsiadm index 8d44262..551a9f5 100755 --- a/docker/iscsiadm +++ b/docker/iscsiadm @@ -8,7 +8,7 @@ echoerr() { printf "%s\n" "$*" >&2; } case ${ISCSIADM_HOST_STRATEGY} in chroot) # https://engineering.docker.com/2019/07/road-to-containing-iscsi/ - chroot /host /usr/bin/env -i PATH="/usr/sbin:/usr/bin:/sbin:/bin" ${ISCSIADM_HOST_PATH} "${@:1}" + chroot /host /usr/bin/env -i PATH="/usr/sbin:/usr/bin:/sbin:/bin:/run/current-system/sw/bin" ${ISCSIADM_HOST_PATH} "${@:1}" ;; nsenter) diff --git a/docker/mount b/docker/mount index fcfd59d..c0603e6 100755 --- a/docker/mount +++ b/docker/mount @@ -31,7 +31,7 @@ while getopts "t:" opt; do done if [[ ${USE_HOST_MOUNT_TOOLS} -eq 1 ]]; then - chroot /host /usr/bin/env -i PATH="/usr/sbin:/usr/bin:/sbin:/bin" mount "${@:1}" + chroot /host /usr/bin/env -i PATH="/usr/sbin:/usr/bin:/sbin:/bin:/run/current-system/sw/bin" mount "${@:1}" else - /usr/bin/env -i PATH="/usr/sbin:/usr/bin:/sbin:/bin" mount "${@:1}" + /usr/bin/env -i PATH="/usr/sbin:/usr/bin:/sbin:/bin:/run/current-system/sw/bin" mount "${@:1}" fi diff --git a/docker/multipath b/docker/multipath index 3d1d6ee..ac097d4 100755 --- a/docker/multipath +++ b/docker/multipath @@ -1,3 +1,3 @@ #!/bin/bash -chroot /host /usr/bin/env -i PATH="/usr/sbin:/usr/bin:/sbin:/bin" multipath "${@:1}" +chroot /host /usr/bin/env -i PATH="/usr/sbin:/usr/bin:/sbin:/bin:/run/current-system/sw/bin" multipath "${@:1}" diff --git a/docker/oneclient b/docker/oneclient index 0815dee..373cefd 100755 --- a/docker/oneclient +++ b/docker/oneclient @@ -1,3 +1,3 @@ #!/bin/bash -chroot /host /usr/bin/env -i PATH="/usr/sbin:/usr/bin:/sbin:/bin" oneclient "${@:1}" +chroot /host /usr/bin/env -i PATH="/usr/sbin:/usr/bin:/sbin:/bin:/run/current-system/sw/bin" oneclient "${@:1}" diff --git a/docker/umount b/docker/umount index 48dd314..1bcd0f2 100755 --- a/docker/umount +++ b/docker/umount @@ -31,7 +31,7 @@ while getopts "t:" opt; do done if [[ ${USE_HOST_MOUNT_TOOLS} -eq 1 ]]; then - chroot /host /usr/bin/env -i PATH="/usr/sbin:/usr/bin:/sbin:/bin" umount "${@:1}" + chroot /host /usr/bin/env -i PATH="/usr/sbin:/usr/bin:/sbin:/bin:/run/current-system/sw/bin" umount "${@:1}" else - /usr/bin/env -i PATH="/usr/sbin:/usr/bin:/sbin:/bin" umount "${@:1}" + /usr/bin/env -i PATH="/usr/sbin:/usr/bin:/sbin:/bin:/run/current-system/sw/bin" umount "${@:1}" fi diff --git a/docker/zfs b/docker/zfs index 4a1f79e..aceb182 100755 --- a/docker/zfs +++ b/docker/zfs @@ -1,3 +1,3 @@ #!/bin/bash -chroot /host /usr/bin/env -i PATH="/usr/sbin:/usr/bin:/sbin:/bin" zfs "${@:1}" +chroot /host /usr/bin/env -i PATH="/usr/sbin:/usr/bin:/sbin:/bin:/run/current-system/sw/bin" zfs "${@:1}" diff --git a/docker/zpool b/docker/zpool index 07241b2..a4696aa 100755 --- a/docker/zpool +++ b/docker/zpool @@ -1,3 +1,3 @@ #!/bin/bash -chroot /host /usr/bin/env -i PATH="/usr/sbin:/usr/bin:/sbin:/bin" zpool "${@:1}" +chroot /host /usr/bin/env -i PATH="/usr/sbin:/usr/bin:/sbin:/bin:/run/current-system/sw/bin" zpool "${@:1}"