diff --git a/scripts/common.sh.in b/scripts/common.sh.in index 75e5a51a58..fed9d1326f 100644 --- a/scripts/common.sh.in +++ b/scripts/common.sh.in @@ -36,6 +36,8 @@ sbindir=@sbindir@ ETCDIR=${ETCDIR:-/etc} DEVDIR=${DEVDIR:-/dev/disk/zpool} ZPOOLDIR=${ZPOOLDIR:-${pkglibexecdir}/zpool-config} +ZPIOSDIR=${ZPIOSDIR:-${pkglibexecdir}/zpios-test} +ZPIOSPROFILEDIR=${ZPIOSPROFILEDIR:-${pkglibexecdir}/zpios-profile} ZDB=${ZDB:-${sbindir}/zdb} ZFS=${ZFS:-${sbindir}/zfs} @@ -43,10 +45,13 @@ ZINJECT=${ZINJECT:-${sbindir}/zinject} ZPOOL=${ZPOOL:-${sbindir}/zpool} ZPOOL_ID=${ZPOOL_ID:-${bindir}/zpool_id} ZTEST=${ZTEST:-${sbindir}/ztest} +ZPIOS=${ZPIOS:-${sbindir}/zpios} COMMON_SH=${COMMON_SH:-${pkglibexecdir}/common.sh} ZFS_SH=${ZFS_SH:-${pkglibexecdir}/zfs.sh} ZPOOL_CREATE_SH=${ZPOOL_CREATE_SH:-${pkglibexecdir}/zpool-create.sh} +ZPIOS_SH=${ZPIOS_SH:-${pkglibexecdir}/zpios.sh} +ZPIOS_SURVEY_SH=${ZPIOS_SURVEY_SH:-${pkglibexecdir}/zpios-survey.sh} LDMOD=${LDMOD:-/sbin/modprobe} LSMOD=${LSMOD:-/sbin/lsmod} diff --git a/scripts/zpios-sanity.sh b/scripts/zpios-sanity.sh index 7b38a883ec..20744a9eb8 100755 --- a/scripts/zpios-sanity.sh +++ b/scripts/zpios-sanity.sh @@ -7,8 +7,6 @@ basedir="$(dirname $0)" SCRIPT_COMMON=common.sh if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then . "${basedir}/${SCRIPT_COMMON}" -elif [ -f /usr/libexec/zfs/${SCRIPT_COMMON} ]; then -. /usr/libexec/zfs/${SCRIPT_COMMON} else echo "Missing helper script ${SCRIPT_COMMON}" && exit 1 fi diff --git a/scripts/zpios-survey.sh b/scripts/zpios-survey.sh index c82f7312bc..cb751b467e 100755 --- a/scripts/zpios-survey.sh +++ b/scripts/zpios-survey.sh @@ -8,8 +8,6 @@ basedir="$(dirname $0)" SCRIPT_COMMON=common.sh if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then . "${basedir}/${SCRIPT_COMMON}" -elif [ -f /usr/libexec/zfs/${SCRIPT_COMMON} ]; then -. /usr/libexec/zfs/${SCRIPT_COMMON} else echo "Missing helper script ${SCRIPT_COMMON}" && exit 1 fi diff --git a/scripts/zpios.sh b/scripts/zpios.sh index f15d39f043..e16a58a3ba 100755 --- a/scripts/zpios.sh +++ b/scripts/zpios.sh @@ -8,8 +8,6 @@ basedir="$(dirname $0)" SCRIPT_COMMON=common.sh if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then . "${basedir}/${SCRIPT_COMMON}" -elif [ -f /usr/libexec/zfs/${SCRIPT_COMMON} ]; then -. /usr/libexec/zfs/${SCRIPT_COMMON} else echo "Missing helper script ${SCRIPT_COMMON}" && exit 1 fi