Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread

This commit is contained in:
Brian Behlendorf 2010-07-28 16:41:21 -07:00
parent 667652473e 26e61dd074
commit 7d9924000b
5 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -82,6 +82,7 @@ AC_CONFIG_FILES([
module/zcommon/Makefile module/zcommon/Makefile
module/zfs/Makefile module/zfs/Makefile
scripts/Makefile scripts/Makefile
scripts/common.sh
zfs.spec zfs.spec
zfs-modules.spec zfs-modules.spec
]) ])

27
scripts/common.sh → scripts/common.sh.in Executable file → Normal file
View File

@ -26,20 +26,27 @@ RAID10S=()
RAIDZS=() RAIDZS=()
RAIDZ2S=() RAIDZ2S=()
prefix=@prefix@
exec_prefix=@exec_prefix@
libexecdir=@libexecdir@
pkglibexecdir=${libexecdir}/@PACKAGE@
bindir=@bindir@
sbindir=@sbindir@
ETCDIR=${ETCDIR:-/etc} ETCDIR=${ETCDIR:-/etc}
DEVDIR=${DEVDIR:-/dev/disk/zpool} DEVDIR=${DEVDIR:-/dev/disk/zpool}
ZPOOLDIR=${ZPOOLDIR:-/usr/libexec/zfs/zpool-config} ZPOOLDIR=${ZPOOLDIR:-${pkglibexecdir}/zpool-config}
ZDB=${ZDB:-/usr/sbin/zdb} ZDB=${ZDB:-${sbindir}/zdb}
ZFS=${ZFS:-/usr/sbin/zfs} ZFS=${ZFS:-${sbindir}/zfs}
ZINJECT=${ZINJECT:-/usr/sbin/zinject} ZINJECT=${ZINJECT:-${sbindir}/zinject}
ZPOOL=${ZPOOL:-/usr/sbin/zpool} ZPOOL=${ZPOOL:-${sbindir}/zpool}
ZPOOL_ID=${ZPOOL_ID:-/usr/bin/zpool_id} ZPOOL_ID=${ZPOOL_ID:-${bindir}/zpool_id}
ZTEST=${ZTEST:-/usr/sbin/ztest} ZTEST=${ZTEST:-${sbindir}/ztest}
COMMON_SH=${COMMON_SH:-/usr/libexec/zfs/common.sh} COMMON_SH=${COMMON_SH:-${pkglibexecdir}/common.sh}
ZFS_SH=${ZFS_SH:-/usr/libexec/zfs/zfs.sh} ZFS_SH=${ZFS_SH:-${pkglibexecdir}/zfs.sh}
ZPOOL_CREATE_SH=${ZPOOL_CREATE_SH:-/usr/libexec/zfs/zpool-create.sh} ZPOOL_CREATE_SH=${ZPOOL_CREATE_SH:-${pkglibexecdir}/zpool-create.sh}
LDMOD=${LDMOD:-/sbin/modprobe} LDMOD=${LDMOD:-/sbin/modprobe}
LSMOD=${LSMOD:-/sbin/lsmod} LSMOD=${LSMOD:-/sbin/lsmod}

2
scripts/zconfig.sh
View File

@ -7,8 +7,6 @@ basedir="$(dirname $0)"
SCRIPT_COMMON=common.sh SCRIPT_COMMON=common.sh
if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then
. "${basedir}/${SCRIPT_COMMON}" . "${basedir}/${SCRIPT_COMMON}"
elif [ -f /usr/libexec/zfs/${SCRIPT_COMMON} ]; then
. /usr/libexec/zfs/${SCRIPT_COMMON}
else else
echo "Missing helper script ${SCRIPT_COMMON}" && exit 1 echo "Missing helper script ${SCRIPT_COMMON}" && exit 1
fi fi

2
scripts/zfs.sh
View File

@ -7,8 +7,6 @@ basedir="$(dirname $0)"
SCRIPT_COMMON=common.sh SCRIPT_COMMON=common.sh
if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then
. "${basedir}/${SCRIPT_COMMON}" . "${basedir}/${SCRIPT_COMMON}"
elif [ -f /usr/libexec/zfs/${SCRIPT_COMMON} ]; then
. /usr/libexec/zfs/${SCRIPT_COMMON}
else else
echo "Missing helper script ${SCRIPT_COMMON}" && exit 1 echo "Missing helper script ${SCRIPT_COMMON}" && exit 1
fi fi

2
scripts/zpool-create.sh
View File

@ -5,8 +5,6 @@ basedir="$(dirname $0)"
SCRIPT_COMMON=common.sh SCRIPT_COMMON=common.sh
if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then if [ -f "${basedir}/${SCRIPT_COMMON}" ]; then
. "${basedir}/${SCRIPT_COMMON}" . "${basedir}/${SCRIPT_COMMON}"
elif [ -f /usr/libexec/zfs/${SCRIPT_COMMON} ]; then
. /usr/libexec/zfs/${SCRIPT_COMMON}
else else
echo "Missing helper script ${SCRIPT_COMMON}" && exit 1 echo "Missing helper script ${SCRIPT_COMMON}" && exit 1
fi fi