Upgrade to mkosi 25.3

.github/workflows/mkosi.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install mkosi
-        uses: systemd/mkosi@v24.3
+        uses: systemd/mkosi@v25.3
       - name: Install tools etc
         run: |
           sudo apt-get install -y --no-install-recommends jq rename uidmap

Vagrantfile

@@ -7,20 +7,22 @@ Vagrant.configure("2") do |config|
   config.vm.define "vagrant"
   config.vm.box = "bento/ubuntu-24.04"
   config.vm.provision:shell, privileged: false, reboot: true, inline: <<-SETUP
+    export DEBIAN_FRONTEND=noninteractive
     sudo apt-get update
-    sudo apt-get install -y --no-install-recommends python3 python3-pip python-is-python3 python3-pyelftools python3-pefile pipx \
-      qemu-user-static binfmt-support bubblewrap dosfstools mtools uidmap libfdisk-dev libtss2-dev libssl-dev debian-archive-keyring \
+    echo 'grub-pc hold' | sudo dpkg --set-selections
+    sudo apt-get install -yq --no-install-recommends python3 python3-pip python-is-python3 python3-pyelftools python3-pefile pipx \
+      qemu-user-static binfmt-support dosfstools mtools uidmap libfdisk-dev libtss2-dev libssl-dev debian-archive-keyring \
       binutils-aarch64-linux-gnu jq
-    sudo apt-get upgrade -y
+    sudo apt-get upgrade -yq
 
     mkdir -p ~/build ~/.local/bin
-    echo "rsync --links -r --exclude=.git --exclude=.vagrant --exclude=mkosi.cache --exclude=mkosi.output --exclude=mkosi.builddir --exclude=mkosi.workspace --delete /vagrant/ ~/build" > ~/.local/bin/vagrant-rsync
+    echo "rsync --links -r --exclude=.git --exclude=.vagrant --exclude=mkosi.cache --exclude=mkosi.output --exclude=mkosi.builddir --exclude=mkosi.workspace --exclude='*.raw*' --delete /vagrant/ ~/build" > ~/.local/bin/vagrant-rsync
     chmod u+x ~/.local/bin/vagrant-rsync
     echo "~/.local/bin/vagrant-rsync" >> ~/.bashrc
     echo "cd ~/build" >> ~/.bashrc
 
     pipx ensurepath
-    pipx install git+https://github.com/systemd/mkosi.git@v24.3
+    pipx install git+https://github.com/systemd/mkosi.git@v25.3
     SETUP
   config.vm.provision:shell, privileged: true, run: 'always', inline: <<-SETUP
     sysctl --ignore --write kernel.apparmor_restrict_unprivileged_unconfined=0

mkosi.conf

@@ -1,23 +1,11 @@
 [Config]
 MinimumVersion=24
-Profile=disk
+Profiles=disk
 
-[Output]
-OutputDirectory=mkosi.output
+[Build]
 CacheDirectory=mkosi.cache
 BuildDirectory=mkosi.builddir
-
-[Distribution]
-Architecture=arm64
-Distribution=debian
-Release=trixie
-
-[Content]
 WithNetwork=yes
-BaseTrees=
-    %O/rootfs_%v
-
-[Host]
 Incremental=yes
 ToolsTree=default
 ToolsTreeDistribution=debian
@@ -27,6 +15,20 @@ ToolsTreePackages=
     qemu-efi-aarch64
     unzip
     xxd
+
+[Output]
+OutputDirectory=mkosi.output
+
+[Distribution]
+Architecture=arm64
+Distribution=debian
+Release=trixie
+
+[Content]
+BaseTrees=
+    %O/rootfs_%v
+
+[Runtime]
 RuntimeSize=8G
 QemuMem=4G
 KernelCommandLineExtra=

mkosi.images/initrd/mkosi.conf

@@ -1,4 +1,4 @@
-[Config]
+[Include]
 Include=mkosi-initrd
 
 [Output]

mkosi.profiles/disk/mkosi.conf

@@ -10,6 +10,10 @@ Format=disk
 SplitArtifacts=yes
 SectorSize=512
 
+[Build]
+Environment=
+    SYSTEMD_ESP_PATH=/efi
+
 [Content]
 Initrds=
     %O/initrd_%v
@@ -20,8 +24,6 @@ RemoveFiles=
 Locale=en_US.UTF-8
 Keymap=fi
 Timezone=Europe/Helsinki
-Environment=
-    SYSTEMD_ESP_PATH=/efi
 Bootable=yes
 Bootloader=systemd-boot
 UnifiedKernelImageFormat=%i_%v