From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 18 Feb 2024 21:11:38 +0000 (+0100)
Subject: ubuntu: Switch default release to noble
X-Git-Tag: v21~44^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2563fe4e9993bf9a885799a2fddfd6afce6e0b17;p=thirdparty%2Fmkosi.git

ubuntu: Switch default release to noble

lunar is EOL. Mantic is broken because systemd-gpt-auto-generator
is missing. We can either change the default back to Jammy or move
forward to Noble. Let's go for the second option as Noble will
release in about two months.
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 379c491fe..846c1fa8a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -105,7 +105,8 @@ jobs:
           - debian
           - fedora
           - opensuse
-          # TODO: Add Ubuntu and CentOS once they have systemd v254 or newer.
+          - ubuntu
+          # TODO: Add CentOS once they have systemd v254 or newer.
         exclude:
           # pacman and archlinux-keyring are not packaged in OpenSUSE.
           - distro: arch
diff --git a/mkosi.conf.d/20-ubuntu/mkosi.conf b/mkosi.conf.d/20-ubuntu/mkosi.conf
index 83933dab3..196ddce95 100644
--- a/mkosi.conf.d/20-ubuntu/mkosi.conf
+++ b/mkosi.conf.d/20-ubuntu/mkosi.conf
@@ -4,7 +4,7 @@
 Distribution=ubuntu
 
 [Distribution]
-@Release=lunar
+@Release=noble
 Repositories=universe
 
 [Content]
diff --git a/mkosi/distributions/debian.py b/mkosi/distributions/debian.py
index db477c615..e67d4ab5f 100644
--- a/mkosi/distributions/debian.py
+++ b/mkosi/distributions/debian.py
@@ -212,6 +212,11 @@ class Installer(DistributionInstaller):
             if not vmlinuz.exists():
                 shutil.copy2(d, vmlinuz)
 
+        # systemd-gpt-auto-generator is disabled by default in Ubuntu:
+        # https://git.launchpad.net/ubuntu/+source/systemd/tree/debian/systemd.links?h=ubuntu/noble-proposed.
+        # Let's make sure it is enabled by default in our images.
+        (context.root / "etc/systemd/system-generators/systemd-gpt-auto-generator").unlink(missing_ok=True)
+
 
     @classmethod
     def remove_packages(cls, context: Context, packages: Sequence[str]) -> None:
diff --git a/mkosi/distributions/ubuntu.py b/mkosi/distributions/ubuntu.py
index 58651e48a..7b07f2153 100644
--- a/mkosi/distributions/ubuntu.py
+++ b/mkosi/distributions/ubuntu.py
@@ -16,7 +16,7 @@ class Installer(debian.Installer):
 
     @classmethod
     def default_release(cls) -> str:
-        return "lunar"
+        return "noble"
 
     @staticmethod
     @listify
diff --git a/tests/__init__.py b/tests/__init__.py
index b2e453b35..ffe28d5c6 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -117,10 +117,7 @@ class Image:
             check=False,
         )
 
-        if self.config.distribution == Distribution.ubuntu or self.config.distribution.is_centos_variant():
-            rc = 0
-        else:
-            rc = 123
+        rc = 0 if self.config.distribution.is_centos_variant() else 123
 
         if result.returncode != rc:
             raise subprocess.CalledProcessError(result.returncode, result.args, result.stdout, result.stderr)
diff --git a/tests/test_initrd.py b/tests/test_initrd.py
index 1ba6536b5..916c94a0d 100644
--- a/tests/test_initrd.py
+++ b/tests/test_initrd.py
@@ -142,8 +142,8 @@ def test_initrd_luks(initrd: Image, passphrase: Path) -> None:
                 Format=vfat
                 CopyFiles=/boot:/
                 CopyFiles=/efi:/
-                SizeMinBytes=512M
-                SizeMaxBytes=512M
+                SizeMinBytes=1G
+                SizeMaxBytes=1G
                 """
             )
         )