Move shared mkosi settings to a single file in mkosi.default.d/

8 files changed, 28 insertions, 90 deletions

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 0c62a7070c..240fa9f90c 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -29,11 +29,14 @@ jobs:
     - name: Install
       run: sudo apt-get update && sudo apt-get install --no-install-recommends python3-pexpect
 
+    - name: Symlink
+      run: ln -s .mkosi/mkosi.${{ matrix.distro }} mkosi.default
+
     - name: Build ${{ matrix.distro }}
-      run: sudo python3 -m mkosi --default .mkosi/mkosi.${{ matrix.distro }} --password= --qemu-headless build
+      run: sudo python3 -m mkosi --password= --qemu-headless build
 
     - name: Boot ${{ matrix.distro }} systemd-nspawn
-      run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --default .mkosi/mkosi.${{ matrix.distro }} --password= --qemu-headless boot
+      run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --qemu-headless boot
 
     - name: Boot ${{ matrix.distro }} QEMU
-      run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --default .mkosi/mkosi.${{ matrix.distro }} --password= --qemu-headless qemu
+      run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --qemu-headless qemu
diff --git a/.gitignore b/.gitignore
index 0b2092d740..d6f6caca55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,4 +36,6 @@ __pycache__/
 /mkosi.builddir/
 /mkosi.output/
 /mkosi.default
+mkosi.default.d/*
+!mkosi.default.d/10-systemd.conf
 /tags
diff --git a/.mkosi/mkosi.arch b/.mkosi/mkosi.arch
index 1d8d3ab840..6192c19104 100644
--- a/.mkosi/mkosi.arch
+++ b/.mkosi/mkosi.arch
@@ -8,16 +8,7 @@
 [Distribution]
 Distribution=arch
 
-[Output]
-Format=raw_btrfs
-Bootable=yes
-HostonlyInitrd=yes
-
-[Partitions]
-RootSize=3G
-
 [Packages]
-Cache=/var/cache/pacman/pkg/
 BuildPackages=
         acl
         bzip2
@@ -61,11 +52,3 @@ Packages=
         qrencode
         strace
         vi
-
-[Host]
-QemuHeadless=yes
-NetworkVeth=yes
-
-[Validation]
-Password=
-Autologin=yes
diff --git a/.mkosi/mkosi.debian b/.mkosi/mkosi.debian
index 6a27abe48e..b1173a67dc 100644
--- a/.mkosi/mkosi.debian
+++ b/.mkosi/mkosi.debian
@@ -7,14 +7,6 @@
 Distribution=debian
 Release=unstable
 
-[Output]
-Format=raw_btrfs
-Bootable=yes
-HostonlyInitrd=yes
-
-[Partitions]
-RootSize=2G
-
 [Packages]
 BuildPackages=
         acl
@@ -77,11 +69,3 @@ Packages=
         nano
         strace
         vim-tiny
-
-[Host]
-QemuHeadless=yes
-NetworkVeth=yes
-
-[Validation]
-Password=
-Autologin=yes
diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora
index 40e3a44366..e24507ad10 100644
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -7,14 +7,6 @@
 Distribution=fedora
 Release=33
 
-[Output]
-Format=gpt_ext4
-Bootable=yes
-HostonlyInitrd=yes
-
-[Partitions]
-RootSize=3G
-
 [Packages]
 BuildPackages=
         audit-libs-devel
@@ -84,14 +76,3 @@ Packages=
         strace
         tpm2-tss
         vi
-
-BuildDirectory=mkosi.builddir
-Cache=mkosi.cache
-
-[Host]
-QemuHeadless=yes
-NetworkVeth=yes
-
-[Validation]
-Password=
-Autologin=yes
diff --git a/.mkosi/mkosi.opensuse b/.mkosi/mkosi.opensuse
index 6ab74b3cf8..15f70a4352 100644
--- a/.mkosi/mkosi.opensuse
+++ b/.mkosi/mkosi.opensuse
@@ -7,18 +7,7 @@
 Distribution=opensuse
 Release=tumbleweed
 
-[Output]
-Format=raw_btrfs
-Bootable=yes
-HostonlyInitrd=yes
-
-[Partitions]
-RootSize=3G
-
 [Packages]
-# Uncomment to share system RPM cache (works only with Tumbleweed)
-#Cache=/var/cache/zypp/packages
-BuildDirectory=mkosi.builddir
 BuildPackages=
         docbook-xsl-stylesheets
         fdupes
@@ -81,11 +70,3 @@ Packages=
         strace
         util-linux
         vi
-
-[Host]
-QemuHeadless=yes
-NetworkVeth=yes
-
-[Validation]
-Password=
-Autologin=yes
diff --git a/.mkosi/mkosi.ubuntu b/.mkosi/mkosi.ubuntu
index 524b1d285b..dd1036fc85 100644
--- a/.mkosi/mkosi.ubuntu
+++ b/.mkosi/mkosi.ubuntu
@@ -8,14 +8,6 @@ Distribution=ubuntu
 Release=focal
 Repositories=main,universe
 
-[Output]
-Format=raw_btrfs
-Bootable=yes
-HostonlyInitrd=yes
-
-[Partitions]
-RootSize=2G
-
 [Packages]
 BuildPackages=
         acl
@@ -80,11 +72,3 @@ Packages=
         nano
         strace
         vim-tiny
-
-[Host]
-QemuHeadless=yes
-NetworkVeth=yes
-
-[Validation]
-Password=
-Autologin=yes
diff --git a/mkosi.default.d/10-systemd.conf b/mkosi.default.d/10-systemd.conf
new file mode 100644
index 0000000000..98ee15bf1b
--- /dev/null
+++ b/mkosi.default.d/10-systemd.conf
@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+# This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi).
+
+[Output]
+Format=gpt_btrfs
+Bootable=yes
+HostonlyInitrd=yes
+
+[Packages]
+BuildDirectory=mkosi.builddir
+Cache=mkosi.cache
+
+[Host]
+QemuHeadless=yes
+NetworkVeth=yes
+
+[Validation]
+Password=
+Autologin=yes