From 789ddbecddaa0ec2ca0e006d82d8b04c113710cf Mon Sep 17 00:00:00 2001 From: Thomas Hipp Date: Thu, 2 Nov 2023 09:25:48 +0100 Subject: [PATCH 01/43] images/debian: Add Debian trixie Signed-off-by: Thomas Hipp (cherry picked from commit f78c7da1fe6c98d52064c2aa7ca3f5ba00cc4c69) Signed-off-by: Din Music License: Apache-2.0 --- images/debian.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/images/debian.yaml b/images/debian.yaml index 75a2b6df4..450940ae1 100644 --- a/images/debian.yaml +++ b/images/debian.yaml @@ -1071,6 +1071,7 @@ files: - bullseye - bookworm - sid + - trixie - path: /etc/systemd/network/enp5s0.network generator: dump @@ -1089,6 +1090,7 @@ files: - bullseye - bookworm - sid + - trixie - path: /etc/default/grub.d/50-lxd.cfg generator: dump @@ -1176,6 +1178,7 @@ packages: - bullseye - bookworm - sid + - trixie - packages: - dbus @@ -1185,6 +1188,7 @@ packages: releases: - bookworm - sid + - trixie - packages: - cloud-init @@ -1231,6 +1235,7 @@ packages: - bullseye - sid - bookworm + - trixie - packages: - grub-efi-arm64 @@ -1251,6 +1256,7 @@ packages: - bullseye - sid - bookworm + - trixie repositories: - name: sources.list @@ -1341,6 +1347,7 @@ actions: releases: - bookworm - sid + - trixie - trigger: post-packages action: |- @@ -1357,6 +1364,7 @@ actions: - bullseye - bookworm - sid + - trixie - trigger: post-packages action: |- @@ -1372,6 +1380,7 @@ actions: releases: - bookworm - sid + - trixie - trigger: post-packages action: |- @@ -1397,6 +1406,7 @@ actions: releases: - bookworm - sid + - trixie - trigger: post-packages action: |- @@ -1462,6 +1472,7 @@ actions: - bullseye - sid - bookworm + - trixie - trigger: post-files action: |- @@ -1473,6 +1484,7 @@ actions: releases: - bookworm - sid + - trixie - trigger: post-files action: |- From 57233773b8cfd7ba54b23f0524b7a920e74acd0f Mon Sep 17 00:00:00 2001 From: Thomas Hipp Date: Tue, 7 Nov 2023 15:13:53 +0100 Subject: [PATCH 02/43] images/centos: Fix mirror for 9-Stream The old mirror has out-of-date packages therefore we need to switch to a mirror with the latest packages. Signed-off-by: Thomas Hipp (cherry picked from commit b9b9b3b94148bce19baef5bb447a65557d386bc6) Signed-off-by: Din Music License: Apache-2.0 --- images/centos.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/centos.yaml b/images/centos.yaml index 80c80dc43..bfe5d1390 100644 --- a/images/centos.yaml +++ b/images/centos.yaml @@ -742,7 +742,7 @@ actions: cat << "EOF" > /etc/yum.repos.d/centos.repo [baseos] name=CentOS Stream $releasever - BaseOS - baseurl=https://mirror.xenyth.net/centos-stream/$stream/BaseOS/$basearch/os/ + baseurl=https://mirror1.hs-esslingen.de/pub/Mirrors/centos-stream/$stream/BaseOS/$basearch/os/ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial gpgcheck=1 repo_gpgcheck=0 @@ -752,7 +752,7 @@ actions: [appstream] name=CentOS Stream $releasever - AppStream - baseurl=https://mirror.xenyth.net/centos-stream/$stream/AppStream/$basearch/os/ + baseurl=https://mirror1.hs-esslingen.de/pub/Mirrors/centos-stream/$stream/AppStream/$basearch/os/ metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-$stream&arch=$basearch&protocol=https,http gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial gpgcheck=1 @@ -765,7 +765,7 @@ actions: cat << "EOF" > /etc/yum.repos.d/centos-addons.repo [extras-common] name=CentOS Stream $releasever - Extras packages - baseurl=https://mirror.xenyth.net/centos-stream/SIGs/$stream/extras/$basearch/extras-common + baseurl=https://mirror1.hs-esslingen.de/pub/Mirrors/centos-stream/SIGs/$stream/extras/$basearch/extras-common gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Extras-SHA512 gpgcheck=1 repo_gpgcheck=0 From e27e9883d4d3ea649bce3709a5ff14941856254f Mon Sep 17 00:00:00 2001 From: Klaus Frank <2544867+agowa@users.noreply.github.com> Date: Sun, 19 Nov 2023 11:21:40 +0100 Subject: [PATCH 03/43] images/ubuntu: Ubuntu noble container netplan missing Signed-off-by: Klaus Frank <2544867+agowa@users.noreply.github.com> (cherry picked from commit ec88d2003e577ecc0b4af42728734f2511d2f508) Signed-off-by: Din Music License: Apache-2.0 --- images/ubuntu.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/images/ubuntu.yaml b/images/ubuntu.yaml index f2d3c07ce..b409cb2f2 100644 --- a/images/ubuntu.yaml +++ b/images/ubuntu.yaml @@ -346,6 +346,7 @@ files: - kinetic - lunar - mantic + - noble types: - container variants: From 72b186f7ad870247823c6a349df444b93070721d Mon Sep 17 00:00:00 2001 From: liberodark Date: Wed, 3 Jan 2024 00:01:37 +0100 Subject: [PATCH 04/43] images/debian: Fix debian/sid build for LXC Signed-off-by: liberodark (cherry picked from commit 8b43953025a421eff59e658bdf5a4cefc391b876) Signed-off-by: Din Music License: Apache-2.0 --- images/debian.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/debian.yaml b/images/debian.yaml index 450940ae1..418fd29da 100644 --- a/images/debian.yaml +++ b/images/debian.yaml @@ -1275,8 +1275,7 @@ packages: - s390x - name: sources.list url: |- - deb http://ftp.ports.debian.org/debian-ports unstable main - deb http://ftp.ports.debian.org/debian-ports unreleased main + deb http://deb.debian.org/debian sid main architectures: - riscv64 From 834be5ac2718ca4c3a5f00f8e4498a29e529c954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Sat, 10 Feb 2024 16:05:22 -0500 Subject: [PATCH 05/43] images: Always use MAC identifier for networkd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit e5f93e469bdab592d29b10128df79b0a7e5358ad) Signed-off-by: Din Music License: Apache-2.0 --- images/alt.yaml | 3 +++ images/amazonlinux.yaml | 2 ++ images/apertis.yaml | 2 ++ images/archlinux.yaml | 6 ++++++ images/debian.yaml | 10 ++++++++++ images/fedora.yaml | 6 ++++++ images/gentoo.yaml | 6 ++++++ 7 files changed, 35 insertions(+) diff --git a/images/alt.yaml b/images/alt.yaml index d006aa892..7a4ed03e3 100644 --- a/images/alt.yaml +++ b/images/alt.yaml @@ -92,6 +92,9 @@ files: [Network] DHCP=ipv4 + + [DHCP] + ClientIdentifier=mac variants: - default diff --git a/images/amazonlinux.yaml b/images/amazonlinux.yaml index 2fdb65112..62d019908 100644 --- a/images/amazonlinux.yaml +++ b/images/amazonlinux.yaml @@ -55,6 +55,8 @@ files: [Network] DHCP=ipv4 + [DHCP] + ClientIdentifier=mac - path: /etc/fstab generator: dump diff --git a/images/apertis.yaml b/images/apertis.yaml index 5a4a00833..ed87f68d9 100644 --- a/images/apertis.yaml +++ b/images/apertis.yaml @@ -61,6 +61,8 @@ files: [Network] DHCP=ipv4 + [DHCP] + ClientIdentifier=mac packages: manager: apt update: true diff --git a/images/archlinux.yaml b/images/archlinux.yaml index 3ad0a8fe7..4a28c1fef 100644 --- a/images/archlinux.yaml +++ b/images/archlinux.yaml @@ -482,6 +482,9 @@ files: [Network] DHCP=ipv4 + + [DHCP] + ClientIdentifier=mac types: - container @@ -494,6 +497,9 @@ files: [Network] DHCP=ipv4 + + [DHCP] + ClientIdentifier=mac types: - vm diff --git a/images/debian.yaml b/images/debian.yaml index 418fd29da..96f36a137 100644 --- a/images/debian.yaml +++ b/images/debian.yaml @@ -1061,10 +1061,15 @@ files: content: |- [Match] Name=eth0 + [Network] DHCP=true + [DHCPv4] UseDomains=true + + [DHCP] + ClientIdentifier=mac types: - container releases: @@ -1078,10 +1083,15 @@ files: content: |- [Match] Name=enp5s0 + [Network] DHCP=true + [DHCPv4] UseDomains=true + + [DHCP] + ClientIdentifier=mac types: - vm variants: diff --git a/images/fedora.yaml b/images/fedora.yaml index 3556ea5e8..1198fac64 100644 --- a/images/fedora.yaml +++ b/images/fedora.yaml @@ -92,6 +92,9 @@ files: [Network] DHCP=ipv4 + + [DHCP] + ClientIdentifier=mac variants: - default types: @@ -106,6 +109,9 @@ files: [Network] DHCP=ipv4 + + [DHCP] + ClientIdentifier=mac variants: - default types: diff --git a/images/gentoo.yaml b/images/gentoo.yaml index 59258ef52..afd996329 100644 --- a/images/gentoo.yaml +++ b/images/gentoo.yaml @@ -351,6 +351,9 @@ files: [Network] DHCP=ipv4 + + [DHCP] + ClientIdentifier=mac types: - container variants: @@ -364,6 +367,9 @@ files: [Network] DHCP=ipv4 + + [DHCP] + ClientIdentifier=mac types: - vm variants: From 96c58e2a6cd4edbb6eb276ddd2ffaee97cfbe5af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Wed, 14 Feb 2024 11:52:01 -0500 Subject: [PATCH 06/43] images/debian: Cleanup grub install MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit aed93a7cf330637552e1f609c130eea43bf00856) Signed-off-by: Din Music License: Apache-2.0 --- images/debian.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/debian.yaml b/images/debian.yaml index 96f36a137..a294a8dd4 100644 --- a/images/debian.yaml +++ b/images/debian.yaml @@ -1468,10 +1468,13 @@ actions: [ "$(uname -m)" = "aarch64" ] && TARGET="arm64" update-grub + # This will create EFI/BOOT grub-install --uefi-secure-boot --target="${TARGET}-efi" --no-nvram --removable + # This will create EFI/debian grub-install --uefi-secure-boot --target="${TARGET}-efi" --no-nvram + update-grub sed -i "s#root=[^ ]*#root=/dev/sda2#g" /boot/grub/grub.cfg types: From 33e9cee30593302342bc5375638ac14444609f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Wed, 14 Feb 2024 11:52:29 -0500 Subject: [PATCH 07/43] images/ubuntu: Align grub-install with Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should fix image creation for Ubuntu 24.04 and later. Thanks a lot to Kienan Stewart for going down the grub rabbit hole and figuring this one out! Reported-by: @kienanstewart Signed-off-by: Stéphane Graber (cherry picked from commit 9431a808827ffe1ba7bc0648f647189dee385a63) Signed-off-by: Din Music License: Apache-2.0 --- images/ubuntu.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/images/ubuntu.yaml b/images/ubuntu.yaml index b409cb2f2..726c7690f 100644 --- a/images/ubuntu.yaml +++ b/images/ubuntu.yaml @@ -725,7 +725,13 @@ actions: [ "$(uname -m)" = "aarch64" ] && TARGET="arm64" update-grub + + # This will create EFI/BOOT grub-install --uefi-secure-boot --target="${TARGET}-efi" --no-nvram --removable + + # This will create EFI/ubuntu + grub-install --uefi-secure-boot --target="${TARGET}-efi" --no-nvram + update-grub sed -i "s#root=[^ ]*#root=/dev/sda2#g" /boot/grub/grub.cfg types: From d5b7dece80aad971f905638ceec0854b1e31eee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Tue, 5 Sep 2023 23:54:56 -0400 Subject: [PATCH 08/43] images/centos: Switch to dnf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit 0efa806e4f632d72fa5aa73983ccd785bdd6c688) Signed-off-by: Din Music License: Apache-2.0 --- images/centos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/centos.yaml b/images/centos.yaml index bfe5d1390..f906125b5 100644 --- a/images/centos.yaml +++ b/images/centos.yaml @@ -496,7 +496,7 @@ files: - 8-Stream packages: - manager: yum + manager: dnf update: true cleanup: true sets: From 0ebeb037036c57135c8d446ab66959637bc85445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Wed, 20 Sep 2023 01:23:41 -0400 Subject: [PATCH 09/43] images/fedora: Re-order package blocks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit 7e764df2d62a4271b9f3d38f7c3f056c21eee666) Signed-off-by: Din Music License: Apache-2.0 --- images/fedora.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/images/fedora.yaml b/images/fedora.yaml index 1198fac64..080b2485c 100644 --- a/images/fedora.yaml +++ b/images/fedora.yaml @@ -227,6 +227,14 @@ packages: types: - vm + - packages: + - libsss_idmap + - libsss_nss_idmap + - sssd-client + - lvm2 + - lvm2-libs + action: remove + actions: - trigger: post-unpack action: |- From f0fe7fa43a5827970d6b791f0b5e22157adbbba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Wed, 20 Sep 2023 15:07:01 -0400 Subject: [PATCH 10/43] images/fedora: Tweak fedora packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit 8a067f1d887fa3b7ff4e2a05ff1c7bfd491fb95d) Signed-off-by: Din Music License: Apache-2.0 --- images/fedora.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/images/fedora.yaml b/images/fedora.yaml index 080b2485c..5704973ed 100644 --- a/images/fedora.yaml +++ b/images/fedora.yaml @@ -227,12 +227,17 @@ packages: types: - vm + - packages: + - lvm2 + - lvm2-libs + action: remove + types: + - vm + - packages: - libsss_idmap - libsss_nss_idmap - sssd-client - - lvm2 - - lvm2-libs action: remove actions: From 3cfe8393457a08cf72e658b2ca905144e131ceb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 28 Dec 2023 18:36:11 +0100 Subject: [PATCH 11/43] images/alpine: Add 3.19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit e390b39bbf55c57335fe4d8aef1aef274a677d24) Signed-off-by: Din Music License: Apache-2.0 --- images/alpine.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/images/alpine.yaml b/images/alpine.yaml index 8c337a25a..ee5647ab7 100644 --- a/images/alpine.yaml +++ b/images/alpine.yaml @@ -328,6 +328,7 @@ packages: releases: - 3.17 - 3.18 + - 3.19 - edge - packages: From 1e8a5009d90bbc3a42be8d48b5ebe31a973cf876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Sat, 27 Jan 2024 02:01:49 -0500 Subject: [PATCH 12/43] images/archlinux: Disable colord in desktop image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit a07a6b04c7d32fad8145879122883c7a2d9ef4ec) Signed-off-by: Din Music License: Apache-2.0 --- images/archlinux.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/archlinux.yaml b/images/archlinux.yaml index 4a28c1fef..ea9ab5c92 100644 --- a/images/archlinux.yaml +++ b/images/archlinux.yaml @@ -736,6 +736,9 @@ actions: # Enable GDM systemctl enable gdm + # Disable colord + systemctl mask colord + cat << EOF > /home/archlinux/firstboot.sh #!/bin/sh From 6bb5a7e01ca7d9b16f00dbd83de077ee2f58de53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 3 Aug 2023 16:57:37 -0400 Subject: [PATCH 13/43] images/alpine: Fix Alpine boot hang in VM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit a9b615148b826696b98f98607194859554fa64d7) Signed-off-by: Din Music License: Apache-2.0 --- images/alpine.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/alpine.yaml b/images/alpine.yaml index ee5647ab7..bbdab6f03 100644 --- a/images/alpine.yaml +++ b/images/alpine.yaml @@ -406,6 +406,9 @@ actions: for svc_name in sshd; do ln -fs /etc/init.d/${svc_name} /etc/runlevels/default/${svc_name} done + + # Tweak to prevent cloud-init from getting stuck. + echo "datasource_list: ['NoCloud', 'ConfigDrive', 'LXD', 'None']" > /etc/cloud/cloud.cfg.d/99_lxc.cfg types: - vm variants: From 2c18ba823120009fbe66637398ccffe3d7a91edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Wed, 19 Jul 2023 13:06:30 -0400 Subject: [PATCH 14/43] images/ubuntu: Drop kinetic images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit ddb841792694cac082e54f706075d932dfe79817) Signed-off-by: Din Music License: Apache-2.0 --- images/ubuntu.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/images/ubuntu.yaml b/images/ubuntu.yaml index 726c7690f..1f62532f3 100644 --- a/images/ubuntu.yaml +++ b/images/ubuntu.yaml @@ -343,7 +343,6 @@ files: - bionic - focal - jammy - - kinetic - lunar - mantic - noble @@ -385,7 +384,6 @@ files: - bionic - focal - jammy - - kinetic - lunar - mantic types: @@ -506,7 +504,6 @@ packages: - fuse3 releases: - jammy - - kinetic - lunar - mantic action: install @@ -536,7 +533,6 @@ packages: - xenial - bionic - jammy - - kinetic - lunar - mantic @@ -550,7 +546,6 @@ packages: - systemd-resolved action: install releases: - - kinetic - lunar - mantic @@ -590,7 +585,6 @@ packages: releases: - focal - jammy - - kinetic - lunar - mantic types: @@ -611,7 +605,6 @@ packages: - bionic - focal - jammy - - kinetic - lunar - mantic types: @@ -683,7 +676,6 @@ actions: - bionic - focal - jammy - - kinetic - lunar - mantic @@ -695,7 +687,6 @@ actions: # Ensure /etc/resolv.conf is symlinked to /run/systemd/resolve/stub-resolv.conf ln -sf ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf releases: - - kinetic - lunar - mantic From 11891f6864ad5bb5d6ae666e525b50868a66b91f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 27 Jul 2023 15:19:17 -0400 Subject: [PATCH 15/43] images/ubuntu: Fix path to growpart MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit 50b29edcff2a875312d9a937cb79f9737be2b047) Signed-off-by: Din Music License: Apache-2.0 --- images/ubuntu.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ubuntu.yaml b/images/ubuntu.yaml index 1f62532f3..c7fd583f0 100644 --- a/images/ubuntu.yaml +++ b/images/ubuntu.yaml @@ -741,7 +741,7 @@ actions: [Service] Type=oneshot ExecStartPre=-/usr/bin/growpart /dev/sda 2 - ExecStart=/usr/sbin/resize2fs /dev/sda2 + ExecStart=/sbin/resize2fs /dev/sda2 [Install] WantedBy=default.target From 5cdcc082a79549548f66a231743185f892969fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 27 Jul 2023 17:40:01 -0400 Subject: [PATCH 16/43] images/ubuntu: Disable geoclue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit e3049ee0477297c001cb7e608a63127b74f4d57f) Signed-off-by: Din Music License: Apache-2.0 --- images/ubuntu.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/ubuntu.yaml b/images/ubuntu.yaml index c7fd583f0..221e4e425 100644 --- a/images/ubuntu.yaml +++ b/images/ubuntu.yaml @@ -758,6 +758,9 @@ actions: #!/bin/sh set -eux + # Disable location service + systemctl mask geoclue.service || true + # Timezone rm -f /etc/localtime ln -s /usr/share/zoneinfo/UTC /etc/localtime From fe17eda1f03756462ef8b8a0d3382bb60d2d9d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Fri, 6 Oct 2023 20:40:34 -0400 Subject: [PATCH 17/43] images/ubuntu: Re-enable legacy cloud-init in Ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cloud-init doesn't know how to handle LXD, so we need the legacy implementation until it does. Signed-off-by: Stéphane Graber (cherry picked from commit 3d5cf30a334fe6f3a7cff4954b9f5d5e3ef0ae14) Signed-off-by: Din Music License: Apache-2.0 --- images/ubuntu.yaml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/images/ubuntu.yaml b/images/ubuntu.yaml index 221e4e425..106bf29d5 100644 --- a/images/ubuntu.yaml +++ b/images/ubuntu.yaml @@ -415,37 +415,21 @@ files: generator: cloud-init variants: - cloud - releases: - - xenial - - bionic - - focal - name: network-config generator: cloud-init variants: - cloud - releases: - - xenial - - bionic - - focal - name: user-data generator: cloud-init variants: - cloud - releases: - - xenial - - bionic - - focal - name: vendor-data generator: cloud-init variants: - cloud - releases: - - xenial - - bionic - - focal - name: ext4 generator: fstab From 452407a15af47798efb1e475556dbdbd9f45cb81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Fri, 28 Jul 2023 19:57:58 -0400 Subject: [PATCH 18/43] images: Skip welcome tour in desktop images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit 712638a3e62d4eb2b01953127992dab6ce831751) Signed-off-by: Din Music License: Apache-2.0 --- images/archlinux.yaml | 3 +++ images/ubuntu.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/images/archlinux.yaml b/images/archlinux.yaml index ea9ab5c92..2cb13a4c1 100644 --- a/images/archlinux.yaml +++ b/images/archlinux.yaml @@ -753,6 +753,9 @@ actions: # Disable 60-second logout prompt when `lxc stop` is called. gsettings set org.gnome.SessionManager logout-prompt false + # Disable welcome tour. + gsettings set org.gnome.shell welcome-dialog-last-shown-version '4294967295' + # Delete this script rm /home/archlinux/firstboot.sh EOF diff --git a/images/ubuntu.yaml b/images/ubuntu.yaml index 106bf29d5..f086844b6 100644 --- a/images/ubuntu.yaml +++ b/images/ubuntu.yaml @@ -773,6 +773,9 @@ actions: # Disable automatic screensaver lock gsettings set org.gnome.desktop.screensaver lock-enabled false + # Disable welcome tour. + gsettings set org.gnome.shell welcome-dialog-last-shown-version '4294967295' + # Delete this script rm /home/ubuntu/firstboot.sh EOF From 7c551a1f5f971eac0d9932600d67d4eced449570 Mon Sep 17 00:00:00 2001 From: Thomas Hipp Date: Thu, 2 Nov 2023 20:38:41 +0100 Subject: [PATCH 19/43] images/ubuntu: Add Ubuntu Noble Numbat (24.04) Signed-off-by: Thomas Hipp (cherry picked from commit 648d334b8082ef5cd60dc35b4c4515032c14fccc) Signed-off-by: Din Music License: Apache-2.0 --- images/ubuntu.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/images/ubuntu.yaml b/images/ubuntu.yaml index f086844b6..dba9309b0 100644 --- a/images/ubuntu.yaml +++ b/images/ubuntu.yaml @@ -386,6 +386,7 @@ files: - jammy - lunar - mantic + - noble types: - vm variants: @@ -490,6 +491,7 @@ packages: - jammy - lunar - mantic + - noble action: install - packages: @@ -519,6 +521,7 @@ packages: - jammy - lunar - mantic + - noble - packages: - cloud-init @@ -532,6 +535,7 @@ packages: releases: - lunar - mantic + - noble - packages: - acpid @@ -571,6 +575,7 @@ packages: - jammy - lunar - mantic + - noble types: - vm @@ -591,6 +596,7 @@ packages: - jammy - lunar - mantic + - noble types: - vm @@ -662,6 +668,7 @@ actions: - jammy - lunar - mantic + - noble - trigger: post-packages action: |- @@ -673,6 +680,7 @@ actions: releases: - lunar - mantic + - noble - trigger: post-packages action: |- From f8c4b7c8530d53424e531a3e7509698a624b444b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Mon, 19 Feb 2024 14:55:13 -0500 Subject: [PATCH 20/43] images/ubuntu: Disable UA auto-attach MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit 1859042004623252ba83c20a6c08f539d0be6e84) Signed-off-by: Din Music License: Apache-2.0 --- images/ubuntu.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/images/ubuntu.yaml b/images/ubuntu.yaml index dba9309b0..a0d08cb8d 100644 --- a/images/ubuntu.yaml +++ b/images/ubuntu.yaml @@ -662,13 +662,9 @@ actions: # Enable systemd-networkd systemctl enable systemd-networkd - releases: - - bionic - - focal - - jammy - - lunar - - mantic - - noble + + # Disable UA attach + systemctl mask ua-auto-attach - trigger: post-packages action: |- From ce266d6e9b56f42e07f5c9e45d8c9d0e10d1ee6f Mon Sep 17 00:00:00 2001 From: Din Music Date: Tue, 20 Feb 2024 11:02:47 +0100 Subject: [PATCH 21/43] images/fedora: Update mirror Signed-off-by: Din Music --- images/fedora.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/fedora.yaml b/images/fedora.yaml index 5704973ed..309e452b4 100644 --- a/images/fedora.yaml +++ b/images/fedora.yaml @@ -268,7 +268,7 @@ actions: for repo in $(ls /etc/yum.repos.d/*.repo); do grep -q '^#baseurl' "${repo}" || continue - sed -ri 's/^metalink=.*/#\0/g;s@^#(baseurl=)http://download.example/pub(.*)@\1https://mirror.csclub.uwaterloo.ca/\2@g' "${repo}" + sed -ri 's/^metalink=.*/#\0/g;s@^#(baseurl=)http://download.example/pub(.*)@\1http://fedora.mirror.constant.com/\2@g' "${repo}" done architectures: - aarch64 From c32422a39dbc6952340a524457de8ee5578b82c6 Mon Sep 17 00:00:00 2001 From: Din Music Date: Tue, 20 Feb 2024 11:06:55 +0100 Subject: [PATCH 22/43] images/ubuntu: Drop lunar images Signed-off-by: Din Music --- images/ubuntu.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/images/ubuntu.yaml b/images/ubuntu.yaml index a0d08cb8d..007d04912 100644 --- a/images/ubuntu.yaml +++ b/images/ubuntu.yaml @@ -343,7 +343,6 @@ files: - bionic - focal - jammy - - lunar - mantic - noble types: @@ -384,7 +383,6 @@ files: - bionic - focal - jammy - - lunar - mantic - noble types: @@ -489,7 +487,6 @@ packages: - fuse3 releases: - jammy - - lunar - mantic - noble action: install @@ -519,7 +516,6 @@ packages: - xenial - bionic - jammy - - lunar - mantic - noble @@ -533,7 +529,6 @@ packages: - systemd-resolved action: install releases: - - lunar - mantic - noble @@ -573,7 +568,6 @@ packages: releases: - focal - jammy - - lunar - mantic - noble types: @@ -594,7 +588,6 @@ packages: - bionic - focal - jammy - - lunar - mantic - noble types: @@ -674,7 +667,6 @@ actions: # Ensure /etc/resolv.conf is symlinked to /run/systemd/resolve/stub-resolv.conf ln -sf ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf releases: - - lunar - mantic - noble From e623968052757d63225bde1cc87db7f24b1d667e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Tue, 18 Jul 2023 21:24:28 -0400 Subject: [PATCH 23/43] images/opensuse: Workaround EFI issue on OpenSUSE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit a8c41e2759c187199c8b7d481ee7b18ea066383b) Signed-off-by: Din Music License: Apache-2.0 --- images/opensuse.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/images/opensuse.yaml b/images/opensuse.yaml index b93cd5e18..605cc8e25 100644 --- a/images/opensuse.yaml +++ b/images/opensuse.yaml @@ -316,6 +316,7 @@ actions: set -eux systemd-machine-id-setup + mount -t tmpfs tmpfs /sys/firmware types: - vm From eb5cebcc403f2cff2921cd0acbae0a3e343b35d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 27 Jul 2023 13:47:00 -0400 Subject: [PATCH 24/43] images/opensuse: Fix opensuse cloud-init builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit bc8170c12691adefc2c29121c171950dd7625f5a) Signed-off-by: Din Music License: Apache-2.0 --- images/opensuse.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/images/opensuse.yaml b/images/opensuse.yaml index 605cc8e25..a38c1bff4 100644 --- a/images/opensuse.yaml +++ b/images/opensuse.yaml @@ -269,6 +269,7 @@ packages: - packages: - cloud-init - cloud-init-config-suse + - fdupes action: install variants: - cloud From 7bee8513a0b6bfc9c5349f02234094dcc4e82acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Fri, 28 Jul 2023 22:19:51 -0400 Subject: [PATCH 25/43] images/opensuse: Fix growpart on opensuse MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit 9e6ca78d1730817ef6e3bab0df84dcf8264da256) Signed-off-by: Din Music License: Apache-2.0 --- images/opensuse.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/opensuse.yaml b/images/opensuse.yaml index a38c1bff4..83a493f92 100644 --- a/images/opensuse.yaml +++ b/images/opensuse.yaml @@ -292,6 +292,8 @@ packages: - x86_64 - packages: + - e2fsprogs + - growpart - kernel-default action: install types: @@ -300,8 +302,6 @@ packages: - packages: - discover - dolphin - - e2fsprogs - - growpart - konsole - sddm action: install @@ -434,7 +434,7 @@ actions: [Service] Type=oneshot - ExecStartPre=-/usr/bin/growpart /dev/sda 2 + ExecStartPre=-/usr/sbin/growpart /dev/sda 2 ExecStart=/usr/sbin/resize2fs /dev/sda2 [Install] From 8fa6d69cfe2ad0c8bbf8be9eb92df45b091fd746 Mon Sep 17 00:00:00 2001 From: "Michael Ziminsky (Z)" Date: Thu, 13 Jul 2023 12:34:03 -0700 Subject: [PATCH 26/43] images/openwrt: Fix openwrt dnsmasq/dhcp on boot Use noop instead of comment to remove calls to `procd_add_jail` so usages inside a shell pipeline don't result in syntax errors Signed-off-by: Michael Ziminsky (Z) (cherry picked from commit 1e539bd9fdc4b4bf5293c2e1fff14721a40a644e) Signed-off-by: Din Music License: Apache-2.0 Signed-off-by: Din Music License: Apache-2.0 --- images/openwrt.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/openwrt.yaml b/images/openwrt.yaml index 83bc07c46..8032a4577 100644 --- a/images/openwrt.yaml +++ b/images/openwrt.yaml @@ -349,7 +349,7 @@ actions: #!/bin/sh # Disable process isolation to make dnsmasq work - sed -i 's/procd_add_jail/# \0/g' /etc/init.d/dnsmasq + sed -i 's/procd_add_jail/: \0/g' /etc/init.d/dnsmasq releases: - snapshot - 22.03 From 74a970ac7280a8e303aa2422c02a7c2ce9373755 Mon Sep 17 00:00:00 2001 From: Thomas Winkler <2049715+tew42@users.noreply.github.com> Date: Sun, 15 Oct 2023 16:18:32 +0200 Subject: [PATCH 27/43] images/openwrt: Update openwrt.yaml for 23.05 Signed-off-by: Thomas Winkler <2049715+tew42@users.noreply.github.com> (cherry picked from commit e27971d05b25f85d6f522d4b91b383e2405803e6) Signed-off-by: Din Music License: Apache-2.0 --- images/openwrt.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/images/openwrt.yaml b/images/openwrt.yaml index 8032a4577..245d8fec2 100644 --- a/images/openwrt.yaml +++ b/images/openwrt.yaml @@ -353,3 +353,4 @@ actions: releases: - snapshot - 22.03 + - 23.05 From 4d2347f373176c5029b49a182e3103fee7744a6a Mon Sep 17 00:00:00 2001 From: Thomas Winkler <2049715+tew42@users.noreply.github.com> Date: Fri, 20 Oct 2023 15:32:44 +0200 Subject: [PATCH 28/43] images/openwrt: Disable sysntpd service Time has to be provided by host anyway. This avoids a crash loop and process isolation errors. Signed-off-by: Thomas Winkler <2049715+tew42@users.noreply.github.com> (cherry picked from commit 49b30aa307853b32aab27b3c331d694b13ce9955) Signed-off-by: Din Music License: Apache-2.0 --- images/openwrt.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/openwrt.yaml b/images/openwrt.yaml index 245d8fec2..eddb676d0 100644 --- a/images/openwrt.yaml +++ b/images/openwrt.yaml @@ -350,6 +350,8 @@ actions: # Disable process isolation to make dnsmasq work sed -i 's/procd_add_jail/: \0/g' /etc/init.d/dnsmasq + # Disable conflicting sysntpd service to avoid crash loop + rm -f /etc/rc.d/*sysntpd releases: - snapshot - 22.03 From 4f017ec16bfa3b0ed1237ecf1f38813eb2a1279d Mon Sep 17 00:00:00 2001 From: Thomas Winkler <2049715+tew42@users.noreply.github.com> Date: Fri, 20 Oct 2023 15:34:48 +0200 Subject: [PATCH 29/43] images/openwrt: Formatting cleanup Signed-off-by: Thomas Winkler <2049715+tew42@users.noreply.github.com> (cherry picked from commit 076e8f3db2a6f403d11469fa9e17c237121446ea) Signed-off-by: Din Music License: Apache-2.0 --- images/openwrt.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/openwrt.yaml b/images/openwrt.yaml index eddb676d0..ee5eadfe8 100644 --- a/images/openwrt.yaml +++ b/images/openwrt.yaml @@ -352,7 +352,8 @@ actions: sed -i 's/procd_add_jail/: \0/g' /etc/init.d/dnsmasq # Disable conflicting sysntpd service to avoid crash loop rm -f /etc/rc.d/*sysntpd - releases: + +releases: - snapshot - 22.03 - 23.05 From a46a41451514e18676c6de73abe95c67b5356c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Sun, 22 Oct 2023 23:15:30 -0400 Subject: [PATCH 30/43] images/openwrt: Fix bad OpenWRT yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit cb7db1aa873bd1f342a1bedeeb9764eb5d0806bb) Signed-off-by: Din Music License: Apache-2.0 --- images/openwrt.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/openwrt.yaml b/images/openwrt.yaml index ee5eadfe8..eddb676d0 100644 --- a/images/openwrt.yaml +++ b/images/openwrt.yaml @@ -352,8 +352,7 @@ actions: sed -i 's/procd_add_jail/: \0/g' /etc/init.d/dnsmasq # Disable conflicting sysntpd service to avoid crash loop rm -f /etc/rc.d/*sysntpd - -releases: + releases: - snapshot - 22.03 - 23.05 From 8b0fd34befdbdf5e79fd525e53cb14a65d94f1a5 Mon Sep 17 00:00:00 2001 From: Daniele Rondina Date: Sun, 24 Dec 2023 18:35:20 +0100 Subject: [PATCH 31/43] images/funtoo: Review specs * review integration with /dev/console for both Funtoo 1.4 and Funtoo Next * enable upgrade. This fix DHCP issue of the Funtoo Next tarball and downgrade dhcpcd to version 10.0.4 Signed-off-by: Daniele Rondina (cherry picked from commit 89052da15ee45896169addcb933a1bedb8148661) Signed-off-by: Din Music License: Apache-2.0 --- images/funtoo.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/images/funtoo.yaml b/images/funtoo.yaml index d73fa59a6..36eea6cd5 100644 --- a/images/funtoo.yaml +++ b/images/funtoo.yaml @@ -257,7 +257,7 @@ files: packages: manager: egoportage - update: false + update: true cleanup: true sets: - packages: @@ -280,5 +280,12 @@ actions: rc-update add netif.eth0 default echo template=dhcpcd > /etc/conf.d/netif.eth0 +- trigger: post-packages + action: |- + #!/bin/bash + # Configure LXD/LXC tty + sed -e 's|^#x1|x1|g' -e '/^c[0-9].*/d' -i /etc/inittab + + mappings: architecture_map: funtoo From 00b235e033c409250a2c7bddd7a84518529f8669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Tue, 5 Sep 2023 22:44:55 -0400 Subject: [PATCH 32/43] images/apertis: Change base image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit 4fcf2e06311bd738784e251ef9f94a1a4d645a80) Signed-off-by: Din Music License: Apache-2.0 --- images/apertis.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/apertis.yaml b/images/apertis.yaml index ed87f68d9..02541d4da 100644 --- a/images/apertis.yaml +++ b/images/apertis.yaml @@ -2,7 +2,7 @@ image: distribution: Apertis description: |- Apertis {{ image.architecture }} {{ image.variant }} {{ image.release }} {{ image.serial }} - variant: minimal + variant: devroot source: downloader: apertis-http @@ -70,6 +70,7 @@ packages: sets: - packages: - sudo + - systemd action: install - packages: From cb2c0040f837ac985478e06083c02b1adbf05609 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Tue, 5 Sep 2023 22:55:36 -0400 Subject: [PATCH 33/43] images/apertis: Switch to sysroot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit a734868c5b56c6fbbde7ffefff960b0a14330b77) Signed-off-by: Din Music License: Apache-2.0 --- images/apertis.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/apertis.yaml b/images/apertis.yaml index 02541d4da..dd7ab692f 100644 --- a/images/apertis.yaml +++ b/images/apertis.yaml @@ -2,7 +2,7 @@ image: distribution: Apertis description: |- Apertis {{ image.architecture }} {{ image.variant }} {{ image.release }} {{ image.serial }} - variant: devroot + variant: sysroot source: downloader: apertis-http @@ -70,7 +70,6 @@ packages: sets: - packages: - sudo - - systemd action: install - packages: From cd1c867d93d2fb539e113ff1de958316949e830e Mon Sep 17 00:00:00 2001 From: Yongxiang Liang Date: Thu, 28 Dec 2023 16:07:26 +0800 Subject: [PATCH 34/43] images/gentoo: Fix missing locale-gen in musl base profile (cherry picked from commit acea3b3bb680a19c918a9db713c74d3999bb0dc4) Signed-off-by: Din Music License: Apache-2.0 --- images/gentoo.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/images/gentoo.yaml b/images/gentoo.yaml index afd996329..1d959c48d 100644 --- a/images/gentoo.yaml +++ b/images/gentoo.yaml @@ -482,8 +482,10 @@ actions: fi # Resolve locale issues - echo en_US.UTF-8 UTF-8 > /etc/locale.gen - locale-gen + if command -v locale-gen >/dev/null; then + echo en_US.UTF-8 UTF-8 > /etc/locale.gen + locale-gen + fi - trigger: post-unpack action: |- From 95179582cac1e6461b42fa1194768dc512d3cd59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Sun, 28 Jan 2024 01:52:30 -0500 Subject: [PATCH 35/43] images/gentoo: Initialize machine-id for kernel install MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit 603a251e9fee34fb2a6c38dbe8a51a96ec6a80ea) Signed-off-by: Din Music License: Apache-2.0 --- images/gentoo.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/images/gentoo.yaml b/images/gentoo.yaml index 1d959c48d..32f7019dc 100644 --- a/images/gentoo.yaml +++ b/images/gentoo.yaml @@ -380,6 +380,9 @@ files: variants: - systemd +- path: /var/lib/dbus/machine-id + generator: remove + - path: /etc/local.d/repo_check.start generator: dump mode: 700 @@ -459,6 +462,16 @@ packages: - vm actions: +- trigger: post-unpack + action: |- + #!/bin/sh + # Generate machine-id in order for the kernel stuff to be configured properly + systemd-machine-id-setup + types: + - vm + variants: + - systemd + - trigger: post-unpack action: |- #!/bin/sh From e8353e59db8ce3e67565f0907b510b4df290b267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Sun, 28 Jan 2024 22:28:04 -0500 Subject: [PATCH 36/43] images/gentoo: Use systemd-boot for systemd image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit 056b7c3e03b63f2272aa4e9f110da1145ad78612) Signed-off-by: Din Music License: Apache-2.0 --- images/gentoo.yaml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/images/gentoo.yaml b/images/gentoo.yaml index 32f7019dc..4559c6f06 100644 --- a/images/gentoo.yaml +++ b/images/gentoo.yaml @@ -454,13 +454,28 @@ packages: - packages: - gentoo-kernel-bin - - grub - syslog-ng - sys-power/acpid action: install types: - vm + - packages: + - grub + action: install + types: + - vm + variants: + - openrc + + - packages: + - systemd-boot + action: install + types: + - vm + variants: + - systemd + actions: - trigger: post-unpack action: |- @@ -616,6 +631,8 @@ actions: sed -i "s#root=[^ ]*#root=/dev/sda2#g" /boot/grub/grub.cfg types: - vm + variants: + - openrc - trigger: post-packages action: |- From d851bff0c511ed710defe919e96c06348f295919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Sun, 28 Jan 2024 23:55:50 -0500 Subject: [PATCH 37/43] images/gentoo: More systemd-boot logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit a987e1a40b2ebcf64fb240a5f07a4ffde7a95e25) Signed-off-by: Din Music License: Apache-2.0 --- images/gentoo.yaml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/images/gentoo.yaml b/images/gentoo.yaml index 4559c6f06..9eba816e3 100644 --- a/images/gentoo.yaml +++ b/images/gentoo.yaml @@ -468,14 +468,6 @@ packages: variants: - openrc - - packages: - - systemd-boot - action: install - types: - - vm - variants: - - systemd - actions: - trigger: post-unpack action: |- @@ -562,6 +554,19 @@ actions: variants: - cloud +- trigger: post-unpack + action: |- + #!/bin/sh + set -eux + mkdir -p /etc/portage/package.use + echo "sys-apps/systemd boot" >> /etc/portage/package.use/systemd + emerge sys-apps/systemd + bootctl install --no-variables --esp-path=/boot/efi/ + types: + - vm + variants: + - systemd + - trigger: post-packages action: |- #!/bin/sh From 07c3fc3f72fcd47116e2b8a27baf28bf1c4d0af0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Mon, 29 Jan 2024 01:12:28 -0500 Subject: [PATCH 38/43] images/gentoo: Split post-unpack/post-files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit c5ad87a83b4f28db984583b4f7d4ff831f4eed0c) Signed-off-by: Din Music License: Apache-2.0 --- images/gentoo.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/images/gentoo.yaml b/images/gentoo.yaml index 9eba816e3..231467c62 100644 --- a/images/gentoo.yaml +++ b/images/gentoo.yaml @@ -561,7 +561,18 @@ actions: mkdir -p /etc/portage/package.use echo "sys-apps/systemd boot" >> /etc/portage/package.use/systemd emerge sys-apps/systemd + types: + - vm + variants: + - systemd + +- trigger: post-files + action: |- + #!/bin/sh + set -eux + rm -Rf /boot/* /boot/efi/* || true bootctl install --no-variables --esp-path=/boot/efi/ + emerge gentoo-kernel-bin types: - vm variants: From a2fe466ce5a9aaa67b3d6b92377571a2e15b2497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Mon, 29 Jan 2024 01:41:41 -0500 Subject: [PATCH 39/43] images/gentoo: Generate machine-id before installing kernel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit c14a553451900e24c4ed548f55101e3981299624) Signed-off-by: Din Music License: Apache-2.0 --- images/gentoo.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/images/gentoo.yaml b/images/gentoo.yaml index 231467c62..f177fe431 100644 --- a/images/gentoo.yaml +++ b/images/gentoo.yaml @@ -571,8 +571,12 @@ actions: #!/bin/sh set -eux rm -Rf /boot/* /boot/efi/* || true + systemd-machine-id-setup bootctl install --no-variables --esp-path=/boot/efi/ emerge gentoo-kernel-bin + + rm -f /etc/machine-id /var/lib/dbus/machine-id + touch /etc/machine-id types: - vm variants: From 4a689a5f427e3ad840d59f241062956fec43a920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Mon, 29 Jan 2024 03:02:40 -0500 Subject: [PATCH 40/43] images/gentoo: Install kernel late MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit 6ba028026c739d73b33383a365b66162b58f2723) Signed-off-by: Din Music License: Apache-2.0 --- images/gentoo.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/images/gentoo.yaml b/images/gentoo.yaml index f177fe431..d5523839f 100644 --- a/images/gentoo.yaml +++ b/images/gentoo.yaml @@ -453,7 +453,6 @@ packages: - cloud - packages: - - gentoo-kernel-bin - syslog-ng - sys-power/acpid action: install From 060e661c2b59d040bd7ab536ab0043012ecb315e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Mon, 29 Jan 2024 11:30:39 -0500 Subject: [PATCH 41/43] images/gentoo: Add installkernel tweak MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber (cherry picked from commit 45904793e10ef76e011ce1177dcc16176e72a342) Signed-off-by: Din Music License: Apache-2.0 --- images/gentoo.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/gentoo.yaml b/images/gentoo.yaml index d5523839f..fc04a3d1b 100644 --- a/images/gentoo.yaml +++ b/images/gentoo.yaml @@ -572,6 +572,8 @@ actions: rm -Rf /boot/* /boot/efi/* || true systemd-machine-id-setup bootctl install --no-variables --esp-path=/boot/efi/ + + echo "sys-kernel/installkernel dracut" >> /etc/portage/package.use/installkernel emerge gentoo-kernel-bin rm -f /etc/machine-id /var/lib/dbus/machine-id From 6837a1c6dc1de8ddcc8858240ec43f4e9828e7cd Mon Sep 17 00:00:00 2001 From: Joonas Niilola Date: Wed, 31 Jan 2024 13:31:37 +0200 Subject: [PATCH 42/43] images/gentoo: vm and installkernel related updates - add +dracut on openrc's installkernel, - bump build size to 6 GB, - update systemd's installkernel to also enable +systemd-kernel-install. Signed-off-by: Joonas Niilola (cherry picked from commit 4e130fc9ae57852c6a77add1285f4203e52fd8b8) Signed-off-by: Din Music License: Apache-2.0 --- images/gentoo.yaml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/images/gentoo.yaml b/images/gentoo.yaml index fc04a3d1b..d7a227c29 100644 --- a/images/gentoo.yaml +++ b/images/gentoo.yaml @@ -293,6 +293,11 @@ source: -----END PGP PUBLIC KEY BLOCK----- targets: + lxd: + vm: + size: 6442450944 + filesystem: ext4 + lxc: create_message: | You just created an {{ image.description }} container. @@ -573,7 +578,7 @@ actions: systemd-machine-id-setup bootctl install --no-variables --esp-path=/boot/efi/ - echo "sys-kernel/installkernel dracut" >> /etc/portage/package.use/installkernel + echo "sys-kernel/installkernel dracut systemd systemd-kernel-install" >> /etc/portage/package.use/installkernel emerge gentoo-kernel-bin rm -f /etc/machine-id /var/lib/dbus/machine-id @@ -583,6 +588,17 @@ actions: variants: - systemd +- trigger: post-files + action: |- + #!/bin/sh + echo "sys-kernel/installkernel dracut" >> /etc/portage/package.use/installkernel + emerge gentoo-kernel-bin + + types: + - vm + variants: + - openrc + - trigger: post-packages action: |- #!/bin/sh From 026530759b67fca0bbf6decb37b780b7e0ec7b4d Mon Sep 17 00:00:00 2001 From: Joonas Niilola Date: Sat, 3 Feb 2024 10:02:17 +0200 Subject: [PATCH 43/43] images/gentoo: installkernel >=20 updates - add "grub" use flag with openrc (I forgot this last time), - "systemd-kernel-install" was settled with "systemd-boot" instead on systemd. Signed-off-by: Joonas Niilola (cherry picked from commit 854a6bab843eba6243c791f01f06e01f984ac310) Signed-off-by: Din Music License: Apache-2.0 --- images/gentoo.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/images/gentoo.yaml b/images/gentoo.yaml index d7a227c29..fa49f85e9 100644 --- a/images/gentoo.yaml +++ b/images/gentoo.yaml @@ -578,7 +578,10 @@ actions: systemd-machine-id-setup bootctl install --no-variables --esp-path=/boot/efi/ - echo "sys-kernel/installkernel dracut systemd systemd-kernel-install" >> /etc/portage/package.use/installkernel + echo "root=/dev/sda2" >> /etc/kernel/cmdline + + echo "sys-apps/systemd kernel-install" >> /etc/portage/package.use/systemd + echo "sys-kernel/installkernel dracut systemd systemd-boot" >> /etc/portage/package.use/installkernel emerge gentoo-kernel-bin rm -f /etc/machine-id /var/lib/dbus/machine-id @@ -591,7 +594,7 @@ actions: - trigger: post-files action: |- #!/bin/sh - echo "sys-kernel/installkernel dracut" >> /etc/portage/package.use/installkernel + echo "sys-kernel/installkernel dracut grub" >> /etc/portage/package.use/installkernel emerge gentoo-kernel-bin types: