From cea280ae5b926f716c1f88c382f455e8d34ecbcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
Date: Mon, 3 Jun 2024 01:02:03 -0400
Subject: [PATCH] debian: Cleanup systemd-networkd config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
---
 images/debian.yaml | 105 ++++-----------------------------------------
 1 file changed, 8 insertions(+), 97 deletions(-)

diff --git a/images/debian.yaml b/images/debian.yaml
index acc002fd..305ddd2b 100644
--- 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: |-