From 7377cf69e520fac7deb88e0f745086211909ea09 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 19 Jun 2024 10:43:15 -0400 Subject: [PATCH 1/6] images/ubuntu: remove traces of Xenial Signed-off-by: Simon Deziel --- images/ubuntu.yaml | 64 ---------------------------------------------- 1 file changed, 64 deletions(-) diff --git a/images/ubuntu.yaml b/images/ubuntu.yaml index c41dc6d36..25320374b 100644 --- a/images/ubuntu.yaml +++ b/images/ubuntu.yaml @@ -3,17 +3,12 @@ image: simplestream: release_aliases: - # xenial: 16.04 # bionic: 18.04 focal: 20.04 jammy: 22.04 mantic: 23.10 noble: 24.04 requirements: - # - requirements: - # cgroup: v1 - # releases: - # - xenial - requirements: cgroup: v2 releases: @@ -368,25 +363,6 @@ files: variants: - default -- path: /etc/network/interfaces - generator: dump - content: |- - # This file describes the network interfaces available on your system - # and how to activate them. For more information, see interfaces(5). - - # The loopback network interface - auto lo - iface lo inet loopback - - auto eth0 - iface eth0 inet dhcp - - source /etc/network/interfaces.d/*.cfg - releases: - - xenial - types: - - container - - path: /etc/netplan/10-lxc.yaml generator: dump mode: 0600 @@ -409,25 +385,6 @@ files: - default - desktop -- path: /etc/network/interfaces - generator: dump - content: |- - # This file describes the network interfaces available on your system - # and how to activate them. For more information, see interfaces(5). - - # The loopback network interface - auto lo - iface lo inet loopback - - auto enp5s0 - iface enp5s0 inet dhcp - - source /etc/network/interfaces.d/*.cfg - releases: - - xenial - types: - - vm - - name: meta-data generator: cloud-init variants: @@ -496,7 +453,6 @@ packages: - packages: - fuse releases: - - xenial - bionic - focal action: install @@ -531,7 +487,6 @@ packages: architectures: - ppc64el releases: - - xenial - bionic - jammy - mantic @@ -550,17 +505,6 @@ packages: - mantic - noble - - packages: - - acpid - action: install - architectures: - - amd64 - - arm64 - releases: - - xenial - types: - - vm - - packages: - grub-efi-amd64-signed - shim-signed @@ -591,14 +535,6 @@ packages: types: - vm - - packages: - - linux-image-virtual-hwe-16.04 - action: install - releases: - - xenial - types: - - vm - - packages: - linux-image-virtual action: install From ff024da1db8f493e2a9341debc0c83ac35831d35 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 19 Jun 2024 10:43:25 -0400 Subject: [PATCH 2/6] github: remove traces of Ubuntu Xenial Signed-off-by: Simon Deziel --- .github/workflows/image-ubuntu.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/image-ubuntu.yml b/.github/workflows/image-ubuntu.yml index 81981aa74..0c8dbc413 100644 --- a/.github/workflows/image-ubuntu.yml +++ b/.github/workflows/image-ubuntu.yml @@ -17,7 +17,6 @@ jobs: fail-fast: false matrix: release: - # - xenial # - bionic - focal - jammy @@ -32,7 +31,6 @@ jobs: # - arm64 exclude: - {variant: desktop, release: bionic} - - {variant: desktop, release: xenial} - {variant: desktop, architecture: arm64} env: From 09327f456a09c043a458266d0fdc5dcd0c3400b5 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 19 Jun 2024 10:44:28 -0400 Subject: [PATCH 3/6] images/ubuntu: remove traces of Bionic Signed-off-by: Simon Deziel --- images/ubuntu.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/images/ubuntu.yaml b/images/ubuntu.yaml index 25320374b..abadd8f1f 100644 --- a/images/ubuntu.yaml +++ b/images/ubuntu.yaml @@ -3,7 +3,6 @@ image: simplestream: release_aliases: - # bionic: 18.04 focal: 20.04 jammy: 22.04 mantic: 23.10 @@ -353,7 +352,6 @@ files: dhcp4: true dhcp-identifier: mac releases: - - bionic - focal - jammy - mantic @@ -374,7 +372,6 @@ files: dhcp4: true dhcp-identifier: mac releases: - - bionic - focal - jammy - mantic @@ -453,7 +450,6 @@ packages: - packages: - fuse releases: - - bionic - focal action: install @@ -487,7 +483,6 @@ packages: architectures: - ppc64el releases: - - bionic - jammy - mantic - noble @@ -539,7 +534,6 @@ packages: - linux-image-virtual action: install releases: - - bionic - focal - jammy - mantic @@ -620,7 +614,6 @@ actions: # Enable systemd-networkd systemctl enable systemd-networkd releases: - - bionic - focal - jammy - mantic From 0d62c12e4ba3555a489f14182275a9bf57afb30a Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 19 Jun 2024 10:44:44 -0400 Subject: [PATCH 4/6] github: remove traces of Ubuntu Bionic Signed-off-by: Simon Deziel --- .github/workflows/image-ubuntu.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/image-ubuntu.yml b/.github/workflows/image-ubuntu.yml index 0c8dbc413..160ee1790 100644 --- a/.github/workflows/image-ubuntu.yml +++ b/.github/workflows/image-ubuntu.yml @@ -17,7 +17,6 @@ jobs: fail-fast: false matrix: release: - # - bionic - focal - jammy - mantic @@ -30,7 +29,6 @@ jobs: - amd64 # - arm64 exclude: - - {variant: desktop, release: bionic} - {variant: desktop, architecture: arm64} env: From 27debf20280fcecf0fc39d151ed77d322058c28f Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 19 Jun 2024 10:48:05 -0400 Subject: [PATCH 5/6] images/ubuntu: remove releases condition when its all of them Signed-off-by: Simon Deziel --- images/ubuntu.yaml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/images/ubuntu.yaml b/images/ubuntu.yaml index abadd8f1f..dbc62e560 100644 --- a/images/ubuntu.yaml +++ b/images/ubuntu.yaml @@ -351,11 +351,6 @@ files: eth0: dhcp4: true dhcp-identifier: mac - releases: - - focal - - jammy - - mantic - - noble types: - container variants: @@ -371,11 +366,6 @@ files: enp5s0: dhcp4: true dhcp-identifier: mac - releases: - - focal - - jammy - - mantic - - noble types: - vm variants: @@ -522,22 +512,12 @@ packages: action: install architectures: - arm64 - releases: - - focal - - jammy - - mantic - - noble types: - vm - packages: - linux-image-virtual action: install - releases: - - focal - - jammy - - mantic - - noble types: - vm From 04b112745faabb045b86c8fc3ed6d12d74497baf Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 19 Jun 2024 10:50:19 -0400 Subject: [PATCH 6/6] images/ubuntu: properly hardcode username The varliable isn't used consistently so might as well remove it. Signed-off-by: Simon Deziel --- images/ubuntu.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/images/ubuntu.yaml b/images/ubuntu.yaml index dbc62e560..fa4baab69 100644 --- a/images/ubuntu.yaml +++ b/images/ubuntu.yaml @@ -691,12 +691,11 @@ actions: echo LANG=en_US.UTF-8 > /etc/locale.conf # User - USERNAME="ubuntu" - useradd ${USERNAME} -s /bin/bash -m -U -G adm,video,users + useradd ubuntu -s /bin/bash -m -U -G adm,video,users cat << EOF > /etc/gdm3/custom.conf [daemon] - AutomaticLogin=${USERNAME} + AutomaticLogin=ubuntu AutomaticLoginEnable=true EOF