From 6899203860db2e2f24724089d74adde6a341aa74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Sj=C3=B6strom?= <lars@radicore.se>
Date: Mon, 24 Feb 2025 23:51:46 +0100
Subject: [PATCH] feat(systemd-repart): fix ESP. now its booting

---
 image/default.nix       |  4 ++++
 image/mkimage.sh        | 10 +++++++---
 utils/qemu-uefi-tpm.nix |  1 -
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/image/default.nix b/image/default.nix
index b4394c2..3d7049b 100644
--- a/image/default.nix
+++ b/image/default.nix
@@ -18,6 +18,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     mtools
   ];
 
+  env = {
+    SYSTEMD_REPART_MKFS_OPTIONS_VFAT = "-S 512 -c";
+  };
+
   systemd = patosPkgs.systemd.out;
   kernel = patosPkgs.kernel.kernel;
   initrd = patosPkgs.initrd.out;
diff --git a/image/mkimage.sh b/image/mkimage.sh
index c7473d7..2ec259f 100644
--- a/image/mkimage.sh
+++ b/image/mkimage.sh
@@ -18,15 +18,19 @@ $systemd/usr/bin/ukify build \
 
 cp ${systemd}/usr/lib/systemd/boot/efi/systemd-bootx64.efi boot/
 
+echo "timeout 1" > boot/loader.conf
+echo -e "title PatOS Platform\nefi /EFI/Linux/patos-linux.efi" > boot/patos.conf
+
 cat <<EOF > repart.d/10-esp.conf
 [Partition]
 Type=esp
 Format=vfat
 SizeMinBytes=96M
 SizeMaxBytes=96M
-SplitName=-
-CopyFiles=/boot/patos-x64.efi:/EFI/Linux/patos-x64.efi
 CopyFiles=/boot/systemd-bootx64.efi:/EFI/BOOT/BOOTX64.EFI
+CopyFiles=/boot/patos-x64.efi:/EFI/Linux/patos-linux.efi
+CopyFiles=/boot/loader.conf:/loader/loader.conf
+CopyFiles=/boot/patos.conf:/loader/entries/patos.conf
 EOF
 
 cat <<EOF > repart.d/10-root.conf
@@ -41,7 +45,7 @@ EOF
 $systemd/usr/bin/systemd-repart \
   --no-pager \
   --empty=create \
-  --size=1G \
+  --size=auto \
   --definitions=./repart.d \
   --root=$out \
   patos-$version.raw
diff --git a/utils/qemu-uefi-tpm.nix b/utils/qemu-uefi-tpm.nix
index d05fbb2..bb151c5 100644
--- a/utils/qemu-uefi-tpm.nix
+++ b/utils/qemu-uefi-tpm.nix
@@ -33,7 +33,6 @@ pkgs.writeShellApplication {
         -smp 8 \
         -m 4G \
         -display none \
-        -nographic \
         -chardev "stdio,id=char0,mux=on,logfile=$state/console.log,signal=off" \
         -serial chardev:char0 \
         -mon chardev=char0 \