diff --git a/lib/libzfs/libzfs_mount.c b/lib/libzfs/libzfs_mount.c index 662b610ba6..6c7ce039d5 100644 --- a/lib/libzfs/libzfs_mount.c +++ b/lib/libzfs/libzfs_mount.c @@ -1436,13 +1436,13 @@ zfs_is_shared(zfs_handle_t *zhp) int zpool_enable_datasets(zpool_handle_t *zhp, const char *mntopts, int flags) { - return B_TRUE; + return B_FALSE; } int zpool_disable_datasets(zpool_handle_t *zhp, boolean_t force) { - return B_TRUE; + return B_FALSE; } #endif /* HAVE_ZPL */ diff --git a/scripts/zpios.sh b/scripts/zpios.sh index 54601402d2..09dbb1603e 100755 --- a/scripts/zpios.sh +++ b/scripts/zpios.sh @@ -23,7 +23,10 @@ echo echo "rm /etc/zfs/zpool.cache" || exit 1 rm -f /etc/zfs/zpool.cache -./zfs.sh -v "${SPL_OPTIONS}" "${ZPOOL_OPTIONS}" || exit 1 + +echo "./zfs.sh" +./zfs.sh "${SPL_OPTIONS}" "${ZPOOL_OPTIONS}" || exit 1 +echo echo ---------------------- SPL Sysctl Tunings ------------------------------ sysctl -A | grep spl @@ -121,8 +124,10 @@ if [ -n "${ZPIOS_POST}" ]; then ${ZPIOS_POST} || exit 1 fi +echo echo "${CMDDIR}/zpool/zpool destroy lustre" ${CMDDIR}/zpool/zpool destroy lustre +echo echo ---------------------- SPL Sysctl Tunings ------------------------------ sysctl -A | grep spl @@ -148,6 +153,7 @@ if [ -f /proc/spl/kmem/slab ]; then echo fi -./zfs.sh -vu || exit 1 +echo "./zfs.sh -u" +./zfs.sh -u || exit 1 exit 0