From 5e73a7634f6acdab9e5bf206a9e03a65d529bc8d Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Sat, 26 Jun 2021 00:40:45 +0200
Subject: [PATCH] wip

---
 bundles/backup/files/backup_path_via_zfs |  4 ++--
 bundles/zfs/items.py                     | 14 +++++++-------
 bundles/zfs/metadata.py                  |  1 +
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/bundles/backup/files/backup_path_via_zfs b/bundles/backup/files/backup_path_via_zfs
index 2fda582..3ef01e8 100644
--- a/bundles/backup/files/backup_path_via_zfs
+++ b/bundles/backup/files/backup_path_via_zfs
@@ -34,11 +34,11 @@ fi
 
 if [[ "$?" == "0" ]]
 then
-  echo "SUCCESS"
   zfs bookmark "$source_dataset@$new_bookmark" "$source_dataset#$new_bookmark"
   zfs destroy "$source_dataset@$new_bookmark"
+  echo "SUCCESS"
 else
-  echo "ERROR"
   zfs destroy "$source_dataset@$new_bookmark"
+  echo "ERROR"
   exit 99
 fi
diff --git a/bundles/zfs/items.py b/bundles/zfs/items.py
index 8aa98a7..6f902ed 100644
--- a/bundles/zfs/items.py
+++ b/bundles/zfs/items.py
@@ -33,10 +33,10 @@ for name, config in node.metadata.get('zfs/datasets', {}).items():
 for name, config in node.metadata.get('zfs/pools', {}).items():
     zfs_pools[name] = config
 
-    # actions[f'pool_{name}_enable_trim'] = {
-    #    'command': f'zpool set autotrim=on {name}',
-    #    'unless':  f'zpool get autotrim -H -o value {name} | grep -q on',
-    #    'needs':   [
-    #        f'zfs_pool:{name}'
-    #    ]
-    # }
+    actions[f'pool_{name}_enable_trim'] = {
+       'command': f'zpool set autotrim=on {name}',
+       'unless':  f'zpool get autotrim -H -o value {name} | grep -q on',
+       'needs':   [
+           f'zfs_pool:{name}'
+       ]
+    }
diff --git a/bundles/zfs/metadata.py b/bundles/zfs/metadata.py
index eae1f17..d429608 100644
--- a/bundles/zfs/metadata.py
+++ b/bundles/zfs/metadata.py
@@ -29,6 +29,7 @@ defaults = {
                 },
             },
             'zfsutils-linux': {
+                'backports': True,
                 'needed_by': {
                     'pkg_apt:zfs-zed',
                     'zfs_dataset:',