From 7376743266d48b3c3db49c9c6fdb711a25b660c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Sj=C3=B6strom?= <lars@radicore.se>
Date: Fri, 14 Mar 2025 15:13:31 +0100
Subject: [PATCH] chore: clean up
---
pkgs/image/mkimage.sh | 30 +++++-------------------------
1 file changed, 5 insertions(+), 25 deletions(-)
diff --git a/pkgs/image/mkimage.sh b/pkgs/image/mkimage.sh
index 3e6ed9e..1d14349 100644
--- a/pkgs/image/mkimage.sh
+++ b/pkgs/image/mkimage.sh
@@ -74,44 +74,24 @@ $systemd/usr/bin/ukify build \
--cmdline "$kernelCmdLine roothash=$roothash" \
-o patos_${version}.efi
-cat <<EOF > reset-os-release
-NAME=PatOS
-PRETTY_NAME=PatOS Factory Reset
-IMAGE_ID=patos
-ID=patos
-IMAGE_VERSION=${version}
-VERSION=${version}
-VERSION_ID=patos
-EOF
-
-$systemd/usr/bin/ukify build \
- --linux $kernel/bzImage \
- --initrd $initrd/initrd.xz \
- --os-release @./reset-os-release \
- --cmdline "$kernelCmdLine roothash=$roothash systemd.factory_reset=yes" \
- -o patos_factory_reset.efi
-
# Secure boot
openssl req -new -x509 -days 365 -nodes -out cert.pem -keyout key.pem -subj "/CN=patagia-signing"
+# install ESP
SYSTEMD_RELAX_ESP_CHECKS=1 $systemd/usr/bin/bootctl install --root ./rootfs --esp-path /boot \
--secure-boot-auto-enroll=true --certificate=./cert.pem --private-key=./key.pem
-
-# install UKIs
-cp patos_${version}.efi rootfs/boot/EFI/Linux
-cp patos_factory_reset.efi rootfs/boot/EFI/Linux
+echo "timeout 2" > rootfs/boot/loader/loader.conf
# sign EFIs
$systemd/usr/lib/systemd/systemd-sbsign sign --certificate=./cert.pem --private-key=./key.pem \
rootfs/boot/EFI/BOOT/BOOTX64.EFI --output=rootfs/boot/EFI/BOOT/BOOTX64.EFI
$systemd/usr/lib/systemd/systemd-sbsign sign --certificate=./cert.pem --private-key=./key.pem \
- rootfs/boot/EFI/Linux/patos_0.0.1.efi --output=rootfs/boot/EFI/Linux/patos_0.0.1.efi
+ patos_${version}.efi --output=patos_${version}.efi
-$systemd/usr/lib/systemd/systemd-sbsign sign --certificate=./cert.pem --private-key=./key.pem \
- rootfs/boot/EFI/Linux/patos_factory_reset.efi --output=rootfs/boot/EFI/Linux/patos_factory_reset.efi
+# install UKI
+cp patos_${version}.efi rootfs/boot/EFI/Linux
-echo "timeout 2" > rootfs/boot/loader/loader.conf
echo "secure-boot-enroll force" >> rootfs/boot/loader/loader.conf
# Final partitioning