lib-ext-backup: cleanups

diff --git a/lib-ext-backup b/lib-ext-backup
index b45d9d763ba2acfe82d7b247bb5137b75056f48e..35aca43a47b3755faaa9180d2d05e395a22c4e97 100644 (file)
--- a/lib-ext-backup
+++ b/lib-ext-backup
@@ -10,7 +10,7 @@ function cryptsetup_open {
         echo "> cryptsetup luksOpen $DEVICE $CRYPTNAME"
         cryptsetup luksOpen "$DEVICE" "$CRYPTNAME" --key-file "/etc/lukskeys/${DISKNAME}"
         mkdir -p /run/ext-backup-crypt/
-        ln -s "/dev/mapper/$CRYPTNAME" /run/ext-backup-crypt/
+        ln -sf "/dev/mapper/$CRYPTNAME" /run/ext-backup-crypt/
     done
 }
 
@@ -58,19 +58,19 @@ function pool_setup {
     zfs set acltype=posixacl "$ZPOOLNAME"
 }
 
-function cleanup_snapshots {
-    echo "> Cleaning snapshots"
-
-    sanoid --configdir=/etc/sanoid/ext-backup --verbose --prune-snapshots
+function syncoidw {
+    echo "> syncoid $1"
+    syncoid "$@" --identifier "$ZPOOLNAME"
 
-    zfs list -t snapshot -r "$ZPOOLNAME" -H -o name \
+    zfs list -t snapshot -H -o name -r "$ZPOOLNAME" \
         | grep -F @syncoid_ \
         | grep -Fv "@syncoid_$ZPOOLNAME" \
         | xargs -rn1 zfs destroy -v
 }
 
-function syncoidw {
-    syncoid --identifier "$ZPOOLNAME" "$@"
+function snapshot_cleanup {
+    echo "> Cleaning snapshots"
+    sanoid --configdir=/etc/sanoid/ext-backup --verbose --prune-snapshots
 }
 
 function main {
@@ -78,8 +78,8 @@ function main {
     cryptsetup_open
     pool_import
     pool_setup
-    sync_snapshots
-    cleanup_snapshots
+    snapshot_sync
+    snapshot_cleanup
     pool_export
     cryptsetup_close
 }