siempie/scripts
0
0
Fork 0
Code Issues Pull Requests Actions Activity

[Scripts] Fixed git merge problem

Browse Source
This commit is contained in:
Simon Cornet 2023-05-10 10:44:07 +02:00
parent 3264da7a18
commit 950941b5e7
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FreeBSD/storage/zfs-dataset-backup.bash
View File

@ -26,10 +26,6 @@ openssl enc -aes-256-ctr -a -pbkdf2 -iter 1000 -salt -k $enc_password \
> $backup_location/$dataset_name-$backup_date.pigz.enc > $backup_location/$dataset_name-$backup_date.pigz.enc
## delete snapshot ## delete snapshot
<<<<<<< HEAD
#sleep 1
=======
>>>>>>> 93e0bfb4f86673a87465d127972c447d7c48cfc0
zfs destroy $dataset_orig@$backup_date zfs destroy $dataset_orig@$backup_date
# report done # report done