From 9a44ea0014e115f1c903c9d8d2ceacce966da852 Mon Sep 17 00:00:00 2001
From: Anton Hvornum <torxed@archlinux.org>
Date: Tue, 12 May 2026 20:35:13 +0200
Subject: [PATCH] Added missing packages for archinstall to work (more might be
 needed, if different disk filesystems are used.

---
 .gitignore                                    | 2 +-
 test_tooling/mkosi/mkosi.postinst.chroot      | 6 +++++-
 test_tooling/mkosi/mkosi.profiles/archinstall | 3 +++
 test_tooling/mkosi/mkosi.version              | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index ac857062..54c865e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,7 @@ requirements.txt
 /cmd_output.txt
 node_modules/
 uv.lock
-test_tooling/mkosi/*image*
+test_tooling/mkosi/mkosi.output/*image*
 test_tooling/mkosi/mkosi.cache/**
 test_tooling/mkosi/mkosi.tools/**
 test_tooling/mkosi/mkosi.tools.manifest
diff --git a/test_tooling/mkosi/mkosi.postinst.chroot b/test_tooling/mkosi/mkosi.postinst.chroot
index c49c7a7f..096857e8 100755
--- a/test_tooling/mkosi/mkosi.postinst.chroot
+++ b/test_tooling/mkosi/mkosi.postinst.chroot
@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 
 git clone https://github.com/archlinux/archinstall.git /root/archinstall-git
+(cd /root/archinstall-git && git checkout master)
+
+# TODO: Set geo-mirrors statically instead
 curl -s "https://archlinux.org/mirrorlist/?country=SE&protocol=https&use_mirror_status=on" | sed -e 's/^#Server/Server/' -e '/^#/d' | rankmirrors -n 5 - > /etc/pacman.d/mirrorlist
 
-# TODO: Set geo-mirrors statically instead
\ No newline at end of file
+pacman-key --init
+pacman-key --populate archlinux
\ No newline at end of file
diff --git a/test_tooling/mkosi/mkosi.profiles/archinstall b/test_tooling/mkosi/mkosi.profiles/archinstall
index 055e000f..75628b61 100644
--- a/test_tooling/mkosi/mkosi.profiles/archinstall
+++ b/test_tooling/mkosi/mkosi.profiles/archinstall
@@ -49,5 +49,8 @@ Packages=
 	python-pyparted
 	python-pydantic
 	python-textual
+	dosfstools
+	btrfs-progs
+	arch-install-scripts
 WithDocs=false
 KernelCommandLine=quiet splash
\ No newline at end of file
diff --git a/test_tooling/mkosi/mkosi.version b/test_tooling/mkosi/mkosi.version
index c7930257..3cacc0b9 100644
--- a/test_tooling/mkosi/mkosi.version
+++ b/test_tooling/mkosi/mkosi.version
@@ -1 +1 @@
-7
\ No newline at end of file
+12
\ No newline at end of file