Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
This commit is contained in:
commit
555d9b091c
|
@ -2,9 +2,11 @@
|
||||||
#
|
#
|
||||||
# ZFS/ZPOOL configuration test script.
|
# ZFS/ZPOOL configuration test script.
|
||||||
|
|
||||||
|
basedir="$(dirname $0)"
|
||||||
|
|
||||||
SCRIPT_COMMON=common.sh
|
SCRIPT_COMMON=common.sh
|
||||||
if [ -f ./${SCRIPT_COMMON} ]; then
|
if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then
|
||||||
. ./${SCRIPT_COMMON}
|
. "${basedir}/${SCRIPT_COMMON}"
|
||||||
elif [ -f /usr/libexec/zfs/${SCRIPT_COMMON} ]; then
|
elif [ -f /usr/libexec/zfs/${SCRIPT_COMMON} ]; then
|
||||||
. /usr/libexec/zfs/${SCRIPT_COMMON}
|
. /usr/libexec/zfs/${SCRIPT_COMMON}
|
||||||
else
|
else
|
||||||
|
|
|
@ -3,9 +3,11 @@
|
||||||
# Wrapper script for easily running a survey of zpios based tests
|
# Wrapper script for easily running a survey of zpios based tests
|
||||||
#
|
#
|
||||||
|
|
||||||
|
basedir="$(dirname $0)"
|
||||||
|
|
||||||
SCRIPT_COMMON=common.sh
|
SCRIPT_COMMON=common.sh
|
||||||
if [ -f ./${SCRIPT_COMMON} ]; then
|
if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then
|
||||||
. ./${SCRIPT_COMMON}
|
. "${basedir}/${SCRIPT_COMMON}"
|
||||||
elif [ -f /usr/libexec/zfs/${SCRIPT_COMMON} ]; then
|
elif [ -f /usr/libexec/zfs/${SCRIPT_COMMON} ]; then
|
||||||
. /usr/libexec/zfs/${SCRIPT_COMMON}
|
. /usr/libexec/zfs/${SCRIPT_COMMON}
|
||||||
else
|
else
|
||||||
|
|
|
@ -3,9 +3,11 @@
|
||||||
# Wrapper script for easily running zpios based tests
|
# Wrapper script for easily running zpios based tests
|
||||||
#
|
#
|
||||||
|
|
||||||
|
basedir="$(dirname $0)"
|
||||||
|
|
||||||
SCRIPT_COMMON=common.sh
|
SCRIPT_COMMON=common.sh
|
||||||
if [ -f ./${SCRIPT_COMMON} ]; then
|
if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then
|
||||||
. ./${SCRIPT_COMMON}
|
. "${basedir}/${SCRIPT_COMMON}"
|
||||||
elif [ -f /usr/libexec/zfs/${SCRIPT_COMMON} ]; then
|
elif [ -f /usr/libexec/zfs/${SCRIPT_COMMON} ]; then
|
||||||
. /usr/libexec/zfs/${SCRIPT_COMMON}
|
. /usr/libexec/zfs/${SCRIPT_COMMON}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue