Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
This commit is contained in:
commit
037d965f04
|
@ -5,9 +5,11 @@
|
||||||
# utilities will be used. If no .script-config can be found then the
|
# utilities will be used. If no .script-config can be found then the
|
||||||
# installed kernel modules and utilities will be used.
|
# installed kernel modules and utilities will be used.
|
||||||
|
|
||||||
|
basedir="$(dirname $0)"
|
||||||
|
|
||||||
SCRIPT_CONFIG=.script-config
|
SCRIPT_CONFIG=.script-config
|
||||||
if [ -f ../${SCRIPT_CONFIG} ]; then
|
if [ -f "${basedir}/../${SCRIPT_CONFIG}" ]; then
|
||||||
. ../${SCRIPT_CONFIG}
|
. "${basedir}/../${SCRIPT_CONFIG}"
|
||||||
else
|
else
|
||||||
MODULES=(zlib_deflate spl zavl znvpair zunicode zcommon zfs)
|
MODULES=(zlib_deflate spl zavl znvpair zunicode zcommon zfs)
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -2,9 +2,11 @@
|
||||||
#
|
#
|
||||||
# A simple script to simply the loading/unloading the ZFS module stack.
|
# A simple script to simply the loading/unloading the ZFS module stack.
|
||||||
|
|
||||||
|
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
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
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