debian: Cleanup systemd-networkd config

Signed-off-by: Stéphane Graber <[email protected]>
lxc · Jun 3, 2024 · cea280a · cea280a
1 parent 8dd9a11
commit cea280a
Showing 1 changed file with 8 additions and 97 deletions.
diff --git a/images/debian.yaml b/images/debian.yaml
@@ -1309,12 +1309,9 @@ actions:
     #!/bin/sh
     set -eux
 
-    # Disable networkd (unused)
-    systemctl mask systemd-networkd.service
-    systemctl mask systemd-networkd.socket
-    systemctl mask systemd-networkd-wait-online.service
-  releases:
-  - buster
+    # Enable networkd
+    systemctl enable systemd-networkd.service
+    systemctl enable systemd-networkd.socket
 
 - trigger: post-packages
   action: |-
@@ -1325,102 +1322,22 @@ actions:
     # startup. This only happens on debian/bullseye/cloud images.
     systemctl disable systemd-networkd.socket
     systemctl disable systemd-networkd.service
-  types:
-  - container
   variants:
   - cloud
   releases:
   - bullseye
 
-- trigger: post-packages
-  action: |-
-    #!/bin/sh
-    set -eu
-
-    systemctl enable systemd-networkd.socket
-    systemctl enable systemd-networkd.service
-  types:
-  - container
-  variants:
-  - default
-  releases:
-  - bullseye
-
-- trigger: post-packages
-  action: |-
-    #!/bin/sh
-    set -eu
-
-    systemctl enable systemd-networkd.socket
-    systemctl enable systemd-networkd.service
-  types:
-  - container
-  variants:
-  - cloud
-  releases:
-  - trixie
-  - sid
-
-- trigger: post-packages
-  action: |-
-    #!/bin/sh
-    set -eux
-
-    # Enable networkd socket
-    systemctl enable systemd-networkd.socket
-  types:
-  - container
-  releases:
-  - bookworm
-  - sid
-  - trixie
-
 - trigger: post-packages
   action: |-
     #!/bin/sh
     set -eux
 
-    # Enable networkd
-    systemctl enable systemd-networkd.service
-  types:
-  - vm
-  variants:
-  - default
-  releases:
-  - bullseye
-  - bookworm
-  - sid
-  - trixie
-
-- trigger: post-packages
-  action: |-
-    #!/bin/sh
-    set -eux
-
-    # Enable networkd
-    systemctl enable systemd-networkd.service
-  types:
-  - vm
-  variants:
-  - cloud
-  releases:
-  - bookworm
-  - sid
-  - trixie
-
-- trigger: post-packages
-  action: |-
-    #!/bin/sh
-    set -eux
-
-    # Disable networkd
-    systemctl disable systemd-networkd.service
-  types:
-  - vm
-  variants:
-  - cloud
+    # Disable networkd (unused)
+    systemctl mask systemd-networkd.service
+    systemctl mask systemd-networkd.socket
+    systemctl mask systemd-networkd-wait-online.service
   releases:
-  - bullseye
+  - buster
 
 - trigger: post-packages
   action: |-
@@ -1496,12 +1413,6 @@ actions:
     sed -i "s#root=[^ ]*#root=${DISTROBUILDER_ROOT_UUID}#g" /boot/grub/grub.cfg
   types:
   - vm
-  releases:
-  - buster
-  - bullseye
-  - sid
-  - bookworm
-  - trixie
 
 - trigger: post-files
   action: |-