diff options
| -rw-r--r-- | scripts/common.sh.in | 9 | ||||
| -rw-r--r-- | zfs-script-config.sh.in | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/scripts/common.sh.in b/scripts/common.sh.in index 09ca818c3..2583efcb2 100644 --- a/scripts/common.sh.in +++ b/scripts/common.sh.in @@ -11,7 +11,8 @@ SCRIPT_CONFIG=zfs-script-config.sh if [ -f "${basedir}/../${SCRIPT_CONFIG}" ]; then . "${basedir}/../${SCRIPT_CONFIG}" else -MODULES=(zlib_deflate spl splat zavl znvpair zunicode zcommon zfs) +KERNEL_MODULES=(zlib_deflate zlib_inflate) +MODULES=(spl splat zavl znvpair zunicode zcommon zfs) fi PROG="<define PROG>" @@ -162,7 +163,7 @@ load_module() { echo "Loading ${NAME} ($@)" fi - ${LDMOD} $* || ERROR="Failed to load $1" return 1 + ${LDMOD} $* &>/dev/null || ERROR="Failed to load $1" return 1 return 0 } @@ -170,6 +171,10 @@ load_module() { load_modules() { mkdir -p /etc/zfs + for MOD in ${KERNEL_MODULES[*]}; do + load_module ${MOD} + done + for MOD in ${MODULES[*]}; do local NAME=`basename ${MOD} .ko` local VALUE= diff --git a/zfs-script-config.sh.in b/zfs-script-config.sh.in index 5ded6dc8b..db4a84654 100644 --- a/zfs-script-config.sh.in +++ b/zfs-script-config.sh.in @@ -39,6 +39,7 @@ LDMOD=/sbin/insmod KERNEL_MODULES=( \ ${KERNELMOD}/lib/zlib_deflate/zlib_deflate.ko \ + ${KERNELMOD}/lib/zlib_inflate/zlib_inflate.ko \ ) SPL_MODULES=( \ @@ -59,7 +60,6 @@ ZPIOS_MODULES=( \ ) MODULES=( \ - ${KERNEL_MODULES[*]} \ ${SPL_MODULES[*]} \ ${ZFS_MODULES[*]} \ ) |