Merge pull request #689 from Vertalo/work/bugfix_zfs_export
Fix to correctly check ZFS on/off closes #661
This commit is contained in:
@@ -212,7 +212,7 @@ if [ -n "${TXZ_EXPORT}" -o -n "${TGZ_EXPORT}" ] && [ -n "${SAFE_EXPORT}" ]; then
|
|||||||
error_exit "Error: Simple archive modes with safe ZFS export can't be used together."
|
error_exit "Error: Simple archive modes with safe ZFS export can't be used together."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if checkyesno bastille_zfs_enable; then
|
if ! checkyesno bastille_zfs_enable; then
|
||||||
if [ -n "${GZIP_EXPORT}" -o -n "${RAW_EXPORT}" -o -n "${SAFE_EXPORT}" -o "${OPT_ZSEND}" = "-Rv" ]; then
|
if [ -n "${GZIP_EXPORT}" -o -n "${RAW_EXPORT}" -o -n "${SAFE_EXPORT}" -o "${OPT_ZSEND}" = "-Rv" ]; then
|
||||||
error_exit "Options --gz, --raw, --safe, --verbose are valid for ZFS configured systems only."
|
error_exit "Options --gz, --raw, --safe, --verbose are valid for ZFS configured systems only."
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user