Merge commit 'refs/top-bases/linux-unused' into linux-unused

This commit is contained in:
Brian Behlendorf 2010-03-09 14:56:16 -08:00
commit 838036387f
4 changed files with 16 additions and 8 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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