Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jose
2020-02-21 11:31:12 -04:00

View File

@@ -60,7 +60,7 @@ error_notify()
jail_export()
{
# Attempt to export the container
DATE=$(date +%F-%H:%M:%S)
DATE=$(date +%F-%H%M%S)
if [ -d "${bastille_jailsdir}/${TARGET}" ]; then
if [ "${bastille_zfs_enable}" = "YES" ]; then
if [ -n "${bastille_zfs_zpool}" ]; then