Add mkosi-vm default config

mkosi.conf

@@ -1,4 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
+[Include]
+Include=mkosi-vm
+
 [Build]
 CacheDirectory=mkosi.cache
 History=yes
@@ -17,16 +20,10 @@ BuildSources=.
 BuildSourcesEphemeral=yes
 
 Packages=
-        bash
         binutils
         gdb
-        less
-        nano
-        strace
         sudo
-        systemd
         tmux
-        udev
         zsh
 
 InitrdPackages=

mkosi.conf.d/20-arch.conf

@@ -5,19 +5,9 @@ Distribution=arch
 
 [Content]
 Packages=
-        base
-        bash
-        dbus-broker
-        dbus-broker-units
-        fish
         grub
-        iproute
-        iputils
-        linux
         openssh
         perf
-        polkit
         python
         qemu-user-static
         shim
-        strace

mkosi.conf.d/20-azure.conf

@@ -12,7 +12,4 @@ Repositories=base-preview
 # test unsigned shim.
 ShimBootloader=none
 Packages=
-        kernel
         kernel-tools
-        systemd-networkd
-        tpm2-tss

mkosi.conf.d/20-centos/mkosi.conf

@@ -12,6 +12,5 @@ Release=9
 # CentOS Stream 10 does not ship an unsigned shim
 ShimBootloader=none
 Packages=
-        kernel-core
         linux-firmware
         perf

mkosi.conf.d/20-fedora/mkosi.conf

@@ -9,8 +9,6 @@ Release=rawhide
 [Content]
 Packages=
         fish
-        kernel-core
         perf
         qemu-user-static
         rpmautospec
-        systemd-networkd

mkosi.conf.d/20-opensuse/mkosi.conf

@@ -10,24 +10,12 @@ Release=tumbleweed
 # OpenSUSE does not ship an unsigned shim
 ShimBootloader=none
 Packages=
-        bash
         diffutils
         fish
-        iproute
-        iputils
-        kernel-kvmsmall
-        libtss2-esys0
-        libtss2-mu0
-        libtss2-rc0
-        libtss2-tcti-device0
         openssh-clients
         openssh-server
-        patterns-base-minimal_base
         perf
-        polkit
         python3
         qemu-linux-user
         shim
-        strace
         sudo-policy-wheel-auth-self
-        systemd-boot

mkosi.conf.d/20-ubuntu/mkosi.conf

@@ -9,5 +9,4 @@ Repositories=universe
 
 [Content]
 Packages=
-        linux-image-virtual
-        linux-tools-virtual
+        linux-tools-generic

mkosi.conf.d/30-azure-centos-fedora/mkosi.conf

@@ -9,13 +9,7 @@ Distribution=|azure
 
 [Content]
 Packages=
-        bash
-        iproute
-        iputils
         openssh-clients
         openssh-server
-        polkit
         python3
         rpm-build
-        strace
-        systemd-resolved

mkosi.conf.d/30-azure-centos-fedora/mkosi.conf.d/20-uefi.conf

@@ -8,4 +8,3 @@ Architecture=|arm64
 Packages=
         grub2-efi
         shim
-        systemd-boot

mkosi.conf.d/30-debian-kali-ubuntu/mkosi.conf

@@ -7,25 +7,9 @@ Distribution=|ubuntu
 
 [Content]
 Packages=
-        ?exact-name(systemd-boot)
-        ?exact-name(systemd-resolved)
-        ^libtss2-esys-[0-9.]+-0$
-        ^libtss2-mu[0-9.-]+$
-        bash
-        dbus-broker
         fish
-        iproute2
-        iputils-ping
-        libtss2-rc0
-        libtss2-tcti-device0
-        login
         openssh-client
         openssh-server
-        polkitd
         python3
         qemu-user-static
         shim-signed
-        strace
-        systemd-coredump
-        systemd-sysv
-        tzdata

mkosi/config.py

@@ -55,7 +55,7 @@
 ConfigDefaultCallback = Callable[[argparse.Namespace], Any]
 
 
-BUILTIN_CONFIGS = ("mkosi-tools", "mkosi-initrd")
+BUILTIN_CONFIGS = ("mkosi-tools", "mkosi-initrd", "mkosi-vm")
 
 
 class Verb(StrEnum):

mkosi/resources/man/mkosi.md

@@ -1859,9 +1859,10 @@ config file is read:
     Note that each path containing extra configuration is only parsed
     once, even if included more than once with `Include=`.
 
-    The builtin configs for the mkosi default initrd and default tools
-    tree can be included by including the literal value `mkosi-initrd` and
-    `mkosi-tools` respectively.
+    The builtin configs for the mkosi default initrd, default tools tree
+    and default virtual machine image can be included by including the
+    literal value `mkosi-initrd`, `mkosi-tools` or `mkosi-vm`
+    respectively.
 
     Note: Include names starting with either of the literals `mkosi-` or
     `contrib-` are reserved for use by mkosi itself.

mkosi/resources/mkosi-vm/mkosi.conf

@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Content]
+Bootable=yes
+
+Packages=
+        bash
+        diffutils
+        gawk
+        grep
+        gzip
+        less
+        nano
+        sed
+        strace
+        systemd
+        udev
+        which

mkosi/resources/mkosi-vm/mkosi.conf.d/arch.conf

@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=arch
+
+[Content]
+Packages=
+        dbus-broker
+        dbus-broker-units
+        iproute
+        iputils
+        linux
+        polkit
+        tpm2-tss

mkosi/resources/mkosi-vm/mkosi.conf.d/azure-centos-fedora/mkosi.conf

@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=|alma
+Distribution=|rocky
+Distribution=|centos
+Distribution=|fedora
+Distribution=|azure
+
+[Content]
+Packages=
+        iproute
+        iputils
+        kernel
+        polkit
+        systemd-resolved
+        tpm2-tss
+        util-linux

mkosi.conf.d/20-debian/mkosi.conf.d/20-arm64.conf → mkosi/resources/mkosi-vm/mkosi.conf.d/azure-centos-fedora/mkosi.conf.d/networkd.conf

@@ -1,8 +1,9 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-Architecture=arm64
+Distribution=|fedora
+Distribution=|azure
 
 [Content]
 Packages=
-        linux-image-cloud-arm64
+        systemd-networkd