Share default image configuration between debian and ubuntu

diff --git a/mkosi.conf.d/20-debian-ubuntu.conf b/mkosi.conf.d/20-debian-ubuntu.conf
new file mode 100644 (file)
index 0000000..2aa9346
--- /dev/null
+++ b/mkosi.conf.d/20-debian-ubuntu.conf
@@ -0,0 +1,55 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=|debian
+Distribution=|ubuntu
+
+[Content]
+Packages=
+        amd64-microcode
+        apt
+        bash
+        btrfs-progs
+        bubblewrap
+        ca-certificates
+        coreutils
+        cpio
+        curl
+        dbus-broker
+        debian-archive-keyring
+        dnf
+        dosfstools
+        e2fsprogs
+        erofs-utils
+        grub-pc
+        intel-microcode
+        libtss2-dev
+        mtools
+        openssh-client
+        openssl
+        ovmf
+        pacman-package-manager
+        pesign
+        python3-cryptography
+        python3-pefile
+        qemu-system
+        sbsigntool
+        shim-signed
+        socat
+        squashfs-tools
+        strace
+        swtpm
+        systemd
+        systemd-boot
+        systemd-container
+        systemd-resolved
+        systemd-sysv
+        tar
+        tzdata
+        udev
+        uidmap
+        util-linux
+        xfsprogs
+        xz-utils
+        zstd
+        zypper

diff --git a/mkosi.conf.d/20-debian.conf b/mkosi.conf.d/20-debian.conf
index 441068914e4963629bc912fb44077a29063b25f5..cd0df3257464b00eea5b056b8c53fe1246a6f52d 100644 (file)
--- a/mkosi.conf.d/20-debian.conf
+++ b/mkosi.conf.d/20-debian.conf
@@ -9,50 +9,4 @@ Repositories=non-free-firmware
 
 [Content]
 Packages=
-        amd64-microcode
-        apt
-        bash
-        btrfs-progs
-        bubblewrap
-        ca-certificates
-        coreutils
-        cpio
-        curl
-        dbus-broker
-        debian-archive-keyring
-        dnf
-        dosfstools
-        e2fsprogs
-        erofs-utils
-        grub-pc
-        intel-microcode
-        libtss2-dev
         linux-image-cloud-amd64
-        mtools
-        openssh-client
-        openssl
-        ovmf
-        pacman-package-manager
-        pesign
-        python3-cryptography
-        python3-pefile
-        qemu-system
-        sbsigntool
-        socat
-        squashfs-tools
-        strace
-        swtpm
-        systemd
-        systemd-boot
-        systemd-container
-        systemd-resolved
-        systemd-sysv
-        tar
-        tzdata
-        udev
-        uidmap
-        util-linux
-        xfsprogs
-        xz-utils
-        zstd
-        zypper

diff --git a/mkosi.conf.d/20-ubuntu.conf b/mkosi.conf.d/20-ubuntu.conf
index cf317fab8299d3450429ce35c1df404a60a089d1..aac6f28abce258ff478413e4a93993dded91b0ee 100644 (file)
--- a/mkosi.conf.d/20-ubuntu.conf
+++ b/mkosi.conf.d/20-ubuntu.conf
@@ -9,15 +9,4 @@ Repositories=universe
 
 [Content]
 Packages=
-        amd64-microcode
-        apt
-        dbus-broker
-        grub-pc
-        intel-microcode
-        linux-image-generic # TODO: Switch to linux-kvm once it supports reading credentials from SMBIOS.
-        systemd
-        systemd-boot
-        systemd-sysv
-        tzdata
-        udev
-        zypper
+        linux-image-generic # TODO: Switch to linux-virtual once it supports reading credentials from SMBIOS.

diff --git a/tests/test_initrd.py b/tests/test_initrd.py
index 683b139ab2ae4115376c55145f9ebb1ec4b951d5..f16fcdc17d538e13f9dc17bd21508e8f6e029eb4 100644 (file)
--- a/tests/test_initrd.py
+++ b/tests/test_initrd.py
@@ -81,7 +81,7 @@ def test_initrd_lvm(initrd: Image) -> None:
 
         drive = Path(image.output_dir.name) / "image.raw"
         drive.touch()
-        os.truncate(drive, 3000 * 1024**2)
+        os.truncate(drive, 5000 * 1024**2)
 
         lodev = run(["losetup", "--show", "--find", "--partscan", drive], stdout=subprocess.PIPE).stdout.strip()
         stack.callback(lambda: run(["losetup", "--detach", lodev]))
@@ -184,7 +184,7 @@ def test_initrd_luks_lvm(initrd: Image, passphrase: Path) -> None:
 
         drive = Path(image.output_dir.name) / "image.raw"
         drive.touch()
-        os.truncate(drive, 3000 * 1024**2)
+        os.truncate(drive, 5000 * 1024**2)
 
         lodev = run(["losetup", "--show", "--find", "--partscan", drive], stdout=subprocess.PIPE).stdout.strip()
         stack.callback(lambda: run(["losetup", "--detach", lodev]))