bundles/systemd-swap/metadata.py: start swap on boot

bundles/systemd-swap/items.py

@@ -1,10 +1,58 @@
-svc_systemd = {
-    'swapfile-prepare.service': {
-        'running': None,
+size = node.metadata.get('systemd-swap')
+
+actions = {
+    'stop_swap': {
+        'command': f'systemctl stop swapfile.swap',
+        'unless': f'! systemctl is-active swapfile.swap',
+        'triggered': True,
+    },
+    'remove_swapfile': {
+        'command': f'rm /swapfile',
+        'unless': f'! test -e /swapfile',
+        'triggered': True,
+        'needs': {
+            'action:stop_swap',
+        },
+    },
+    'create_swapfile': {
+        'command': f'fallocate -l {size} /swapfile',
+        'unless': f'stat -c %s /swapfile | grep ^{size}$',
+        'preceded_by': {
+            'action:stop_swap',
+            'action:remove_swapfile',
+        },
+        'triggers': {
+            'action:initialize_swapfile',
+            'svc_systemd:swapfile.swap:restart',
+        },
+    },
+    'swapfile_mode': {
+        'command': f'chmod 600 /swapfile',
+        'unless': f'stat -c "%a" /swapfile | grep -q "^600$"',
+        'needs': {
+            'action:create_swapfile',
+        },
+        'triggers': {
+            'svc_systemd:swapfile.swap:restart',
+        },
+    },
+    'initialize_swapfile': {
+        'command': f'mkswap /swapfile',
+        'triggered': True,
+        'needs': {
+            'action:swapfile_mode',
+        }
+    },
+}
+
+svc_systemd = {
+    'swapfile.swap': {
+        'preceded_by': {
+            'action:initialize_swapfile',
+        },
+        'needs': {
+            'action:initialize_swapfile',
+            'action:systemd-reload',
         },
-    'swapfile.swap': {
-        'needs': [
-            'svc_systemd:swapfile-prepare.service',
-        ],
     },
 }

bundles/systemd-swap/metadata.py

@@ -3,11 +3,6 @@ defaults = {
     'systemd': {
         'units': {
             'swapfile.swap': {
-                'Unit': {
-                    'PartOf': {
-                        'swapfile-prepare.service', # restart together
-                    },
-                },
                 'Swap': {
                     'What': '/swapfile',
                 },
@@ -20,41 +15,3 @@ defaults = {
         },
     },
 }
-
-
-@metadata_reactor.provides(
-    'systemd/units/swapfile.swap',
-)
-def unit(metadata):
-    size = metadata.get('systemd-swap')
-
-    return {
-        'systemd': {
-            'units': {
-                'swapfile-prepare.service': {
-                    'Unit': {
-                        'Before': {
-                            'swapfile.swap',
-                        },
-                        'PartOf': {
-                            'swapfile.swap', # restart together
-                        },
-                    },
-                    'Service': {
-                        'Type': 'oneshot',
-                        'ExecStartPre': [
-                            '-/bin/rm /swapfile -f',
-                            f'/bin/fallocate -l {size} /swapfile',
-                            '/bin/chmod 600 /swapfile',
-                        ],
-                        'ExecStart': '/usr/sbin/mkswap /swapfile',
-                    },
-                    'Install': {
-                        'RequiredBy': {
-                            'swapfile.swap',
-                        },
-                    },
-                },
-            },
-        },
-    }