From b3ad9f9962c53fde9303d62c6facb32102b92672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Sj=C3=B6strom?= Date: Tue, 25 Feb 2025 18:01:44 +0100 Subject: [PATCH] feat(image): fix osrel in uki --- image/mkimage.sh | 5 +---- rootfs/mkrootfs.sh | 12 +++++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/image/mkimage.sh b/image/mkimage.sh index 019aed2..4ad147b 100644 --- a/image/mkimage.sh +++ b/image/mkimage.sh @@ -128,15 +128,13 @@ ln -sf ../demo.service rootfs/usr/lib/systemd/system/basic.target.wants/demo.ser $systemd/usr/bin/ukify build \ --linux $kernel/bzImage \ --initrd $initrd/initrd.xz \ - --os-release rootfs/etc/os-release \ - --stub $systemd/usr/lib/systemd/boot/efi/linuxx64.efi.stub \ + --os-release @rootfs/etc/os-release \ --cmdline "$kernelCmdLine" \ -o boot/patos.efi 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.efi" > boot/patos.conf cat < repart.d/10-esp.conf [Partition] @@ -147,7 +145,6 @@ SizeMaxBytes=96M CopyFiles=/boot/systemd-bootx64.efi:/EFI/BOOT/BOOTX64.EFI CopyFiles=/boot/patos.efi:/EFI/Linux/patos.efi CopyFiles=/boot/loader.conf:/loader/loader.conf -CopyFiles=/boot/patos.conf:/loader/entries/patos.conf EOF cat < repart.d/10-root.conf diff --git a/rootfs/mkrootfs.sh b/rootfs/mkrootfs.sh index 3ee0ca3..e60e028 100644 --- a/rootfs/mkrootfs.sh +++ b/rootfs/mkrootfs.sh @@ -19,12 +19,14 @@ rm -f $out/usr/lib/systemd/system/sysinit.target.wants/systemd-firstboot.service rm -f $out/usr/lib/udev/rules.d/90-vconsole.rules cat < $out/etc/os-release -NAME="PatOS" -PRETTY_NAME="PatOS 0.0.1 (pre-alpha)" +NAME=PatOS +PRETTY_NAME=PatOS 0.0.1 (pre-alpha) +IMAGE_ID=patos ID=patos -VERSION="0.0.1 (pre-alpha)" -VERSION_CODENAME=pre-alpha -VERSION_ID="0.0.1" +IMAGE_VERSION=0.0.1 +VERSION=0.0.1 +VERSION_ID=0.0.1 +BUILD_ID=0.0.1 EOF sed -i 's#After=\(.*\)#After=sysroot.mount \1#' $out/usr/lib/systemd/system/systemd-repart.service