various fixes, remove some TODOs

bundles/apt/files/sources.list-debian-bullseye

@@ -1,3 +1,3 @@
 deb http://deb.debian.org/debian/ bullseye main non-free contrib
-#deb http://security.debian.org/debian-security bullseye/updates main contrib non-free
+deb http://security.debian.org/debian-security bullseye-security main contrib non-free
 deb http://deb.debian.org/debian/ bullseye-updates main contrib non-free

bundles/basic/items.py

@@ -3,8 +3,6 @@ from uuid import UUID
 
 from bundlewrap.utils.text import italic
 
-# TODO support non-systemd systems
-
 files = {
     '/etc/default/locale': {
         'content_type': 'mako',

bundles/nftables/metadata.py

@@ -4,15 +4,18 @@ defaults = {
     'apt': {
         'packages': {
             'nftables': {},
-
-            # XXX remove after all systems have been migrated
         },
     },
     'pacman': {
         'packages': {
             'nftables': {},
+            'iptables': {
+                'installed': False,
+                'needed_by': {
+                    'pkg_pacman:iptables-nft',
+                },
+            },
             'iptables-nft': {
-                # uninstalls iptables automatically
                 'needed_by': {
                     'pkg_pacman:nftables',
                 },