From 593730c7eea5b5e236572cb8b2c68e304e7bcf3d Mon Sep 17 00:00:00 2001
From: Din Music <din.music@canonical.com>
Date: Thu, 25 Apr 2024 17:38:09 +0000
Subject: [PATCH 1/2] images/ubuntu: Disable systemd-networkd on Noble

Signed-off-by: Din Music <din.music@canonical.com>
Co-authored-by: Simon Deziel <simon.deziel@canonical.com>
---
 images/ubuntu.yaml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/images/ubuntu.yaml b/images/ubuntu.yaml
index 731064bce..c41dc6d36 100644
--- a/images/ubuntu.yaml
+++ b/images/ubuntu.yaml
@@ -671,12 +671,24 @@ actions:
     #!/bin/sh
     set -eux
 
-    # Enable systemd-networkd
-    systemctl enable systemd-networkd
-
     # Disable UA attach
     systemctl mask ua-auto-attach
 
+  # Ubuntu Desktop images come with NetworkManager by default,
+  # so we should stop enabling systemd-networkd from Noble onwards.
+- trigger: post-packages
+  action: |-
+    #!/bin/sh
+    set -eux
+
+    # Enable systemd-networkd
+    systemctl enable systemd-networkd
+  releases:
+  - bionic
+  - focal
+  - jammy
+  - mantic
+
 - trigger: post-packages
   action: |-
     #!/bin/sh

From 51ddba7ab9001f6013ee05a06708dbec3e864645 Mon Sep 17 00:00:00 2001
From: Din Music <din.music@canonical.com>
Date: Thu, 25 Apr 2024 18:45:21 +0000
Subject: [PATCH 2/2] github/workflows: Enable Ubuntu Noble desktop images

Signed-off-by: Din Music <din.music@canonical.com>
Co-authored-by: Simon Deziel <simon.deziel@canonical.com>
---
 .github/workflows/image-ubuntu.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/image-ubuntu.yml b/.github/workflows/image-ubuntu.yml
index 36985241f..81981aa74 100644
--- a/.github/workflows/image-ubuntu.yml
+++ b/.github/workflows/image-ubuntu.yml
@@ -22,7 +22,7 @@ jobs:
           - focal
           - jammy
           - mantic
-          # - noble
+          - noble
         variant:
           - desktop
           # - default