update to bw 4.11.2

bundles/smartd/metadata.py

@@ -24,7 +24,7 @@ def zfs_disks_to_metadata(metadata):
     disks = set()
 
     for config in metadata.get('zfs/pools', {}).values():
-        for option in config:
+        for option in config['when_creating']['config']:
             if option.get('type', '') in {'log', 'cache'}:
                 continue
 

bundles/zfs/items.py

@@ -79,12 +79,10 @@ svc_systemd = {
 zfs_datasets = node.metadata.get('zfs/datasets', {})
 
 for name, attrs in node.metadata.get('zfs/pools', {}).items():
-    zfs_pools[name] = {
-        'config': attrs,
-    }
+    zfs_pools[name] = attrs
 
     if node.os_version[0] > 10:
-        zfs_pools[name]['autotrim'] = True
+        zfs_pools[name]['autotrim'] = attrs.get('autotrim', True)
 
 directories = {
     "/etc/zfs-snapshot-backup-pre.d": {