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

scripts/common.sh

@@ -5,9 +5,11 @@
 # utilities will be used.  If no .script-config can be found then the
 # installed kernel modules and utilities will be used.
 
+basedir="$(dirname $0)"
+
 SCRIPT_CONFIG=.script-config
-if [ -f ../${SCRIPT_CONFIG} ]; then
-. ../${SCRIPT_CONFIG}
+if [ -f "${basedir}/../${SCRIPT_CONFIG}" ]; then
+. "${basedir}/../${SCRIPT_CONFIG}"
 else
 MODULES=(zlib_deflate spl zavl znvpair zunicode zcommon zfs)
 fi

scripts/zconfig.sh

@@ -2,9 +2,11 @@
 #
 # ZFS/ZPOOL configuration test script.
 
+basedir="$(dirname $0)"
+
 SCRIPT_COMMON=common.sh
-if [ -f ./${SCRIPT_COMMON} ]; then
-. ./${SCRIPT_COMMON}
+if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then
+. "${basedir}/${SCRIPT_COMMON}"
 elif [ -f /usr/libexec/zfs/${SCRIPT_COMMON} ]; then
 . /usr/libexec/zfs/${SCRIPT_COMMON}
 else

scripts/zfs.sh

@@ -2,9 +2,11 @@
 #
 # A simple script to simply the loading/unloading the ZFS module stack.
 
+basedir="$(dirname $0)"
+
 SCRIPT_COMMON=common.sh
-if [ -f ./${SCRIPT_COMMON} ]; then
-. ./${SCRIPT_COMMON}
+if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then
+. "${basedir}/${SCRIPT_COMMON}"
 elif [ -f /usr/libexec/zfs/${SCRIPT_COMMON} ]; then
 . /usr/libexec/zfs/${SCRIPT_COMMON}
 else

scripts/zpool-create.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
 
+basedir="$(dirname $0)"
+
 SCRIPT_COMMON=common.sh
-if [ -f ./${SCRIPT_COMMON} ]; then
-. ./${SCRIPT_COMMON}
+if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then
+. "${basedir}/${SCRIPT_COMMON}"
 elif [ -f /usr/libexec/zfs/${SCRIPT_COMMON} ]; then
 . /usr/libexec/zfs/${SCRIPT_COMMON}
 else