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 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