diff --git a/CHANGELOG b/CHANGELOG index 2a8d46d..f8e6e8a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ ====================== Version Description +1.0.14......Destroy ZFS dataset before rename. 1.0.13......Add ability to enable ZFS easily. 1.0.12......Change tar archive extension. 1.0.11......Backup and Restore implementation changes. diff --git a/bastille-init b/bastille-init index 4edde67..ec7ae86 100755 --- a/bastille-init +++ b/bastille-init @@ -604,8 +604,8 @@ zfs_activate() zfs create ${bastille_zfs_options} ${bastille_zfs_zpool}/${bastille_zfs_prefix} if [ $? -ne 0 ]; then echo "Failed to enable ZFS, reverting changes." - mv ${CWDIR}.old ${CWDIR} zfs destroy ${bastille_zfs_zpool}/${bastille_zfs_prefix} + mv ${CWDIR}.old ${CWDIR} else echo "Synchronizing '${BASTILLE_DIR}' data on new dataset" rsync -a ${CWDIR}.old/ ${CWDIR}/ diff --git a/version b/version index 2ac9634..5b09c67 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.0.13 +1.0.14