bundles/sysctl: work around debian bug

The debian systemd will silently overwrite /etc/sysctl.d/99-sysctl.conf
with a symlink to /etc/sysctl.conf. We don't want that.

bundles/sysctl/items.py

@@ -3,11 +3,20 @@ files = {
         'content':
             '#!/bin/sh\n'
             '\n'
-            'cat /etc/sysctl.d/*.conf /etc/sysctl.conf | sysctl -e -p -',
+            'cat /etc/sysctl.d/*.conf | sysctl -e -p -',
         'mode': '0700',
     },
-    '/etc/sysctl.d/99-sysctl.conf': {
+    '/etc/sysctl.d/98-sysctl.conf': {
         'content_type': 'mako',
+        'triggers': {
+            'action:apply-sysctl-settings',
+        },
+    },
+    '/etc/sysctl.conf': {
+        'delete': True,
+        'triggers': {
+            'action:apply-sysctl-settings',
+        },
     },
 }