Add common config file for centos (and friends) and fedora

diff --git a/mkosi.conf.d/20-centos-fedora.conf b/mkosi.conf.d/20-centos-fedora.conf
new file mode 100644 (file)
index 0000000..47cda82
--- /dev/null
+++ b/mkosi.conf.d/20-centos-fedora.conf
@@ -0,0 +1,49 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=|centos
+Distribution=|alma
+Distribution=|rocky
+Distribution=|fedora
+
+[Content]
+Packages=
+        apt
+        bash
+        bubblewrap
+        ca-certificates
+        coreutils
+        cpio
+        curl-minimal
+        debian-keyring
+        distribution-gpg-keys
+        dnf
+        dosfstools
+        e2fsprogs
+        edk2-ovmf
+        erofs-utils
+        grub2-pc
+        kernel-core
+        mtools
+        openssh-clients
+        openssl
+        pesign
+        python3-cryptography
+        qemu-kvm-core
+        shadow-utils
+        socat
+        squashfs-tools
+        strace
+        swtpm
+        systemd
+        systemd-boot
+        systemd-container
+        systemd-networkd
+        systemd-resolved
+        systemd-udev
+        tar
+        util-linux
+        virtiofsd
+        xfsprogs
+        xz
+        zstd

diff --git a/mkosi.conf.d/20-centos.conf b/mkosi.conf.d/20-centos.conf
index 3fa622e0030e10a7bac04a24ccd1c8ba8c3f09a7..dfd3fe00c4862fc713eb7c6f176583a3d07539ff 100644 (file)
--- a/mkosi.conf.d/20-centos.conf
+++ b/mkosi.conf.d/20-centos.conf
@@ -9,43 +9,3 @@ Distribution=|rocky
 @Release=9
 Repositories=epel
              epel-next
-
-[Content]
-Packages=
-        apt
-        bash
-        bubblewrap
-        ca-certificates
-        coreutils
-        cpio
-        curl
-        debian-keyring
-        distribution-gpg-keys
-        dnf
-        dosfstools
-        e2fsprogs
-        edk2-ovmf
-        grub2-pc
-        kernel-core
-        mtools
-        openssh-clients
-        openssl
-        pesign
-        python3-cryptography
-        qemu-kvm-core
-        shadow-utils
-        socat
-        squashfs-tools
-        strace
-        swtpm
-        systemd
-        systemd-boot
-        systemd-container
-        systemd-udev
-        tar
-        udev
-        util-linux
-        virtiofsd
-        xfsprogs
-        xz
-        zstd

diff --git a/mkosi.conf.d/20-fedora.conf b/mkosi.conf.d/20-fedora.conf
index a11cec0bf3ba4f497ede7351ef5bb0d40487f243..c56fc8bda2b49c051a1494d324350bad25337bd6 100644 (file)
--- a/mkosi.conf.d/20-fedora.conf
+++ b/mkosi.conf.d/20-fedora.conf
@@ -8,49 +8,10 @@ Distribution=fedora
 
 [Content]
 Packages=
-        apt
         archlinux-keyring
-        bash
         btrfs-progs
-        bubblewrap
-        ca-certificates
-        coreutils
-        cpio
-        curl-minimal
-        debian-keyring
-        distribution-gpg-keys
-        dnf
         dnf5
-        dosfstools
-        e2fsprogs
-        edk2-ovmf
-        erofs-utils
-        grub2-pc
-        kernel-core
-        mtools
-        openssh-clients
-        openssl
         pacman
-        pesign
-        python3-cryptography
-        qemu-kvm-core
         sbsigntools
-        shadow-utils
-        socat
-        squashfs-tools
-        strace
-        swtpm
-        systemd
-        systemd-boot
-        systemd-container
-        systemd-networkd
-        systemd-resolved
-        systemd-udev
         systemd-ukify
-        tar
-        util-linux
-        virtiofsd
-        xfsprogs
-        xz
-        zstd
         zypper