From f38176eb3df550ae6d0968c99e8e09a593e4599f Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Mon, 30 Oct 2023 22:40:59 +0100 Subject: [PATCH] update to hopefully work with newer mkosi the behavior got a bit switched around with only .chroot scripts now getting run inside the chroot. strangely that doesn't work for postinst so manually try to force that into chroot --- mkosi.finalize => mkosi.finalize.chroot | 0 mkosi.postinst | 10 ++++++++-- mkosi.prepare => mkosi.prepare.chroot | 0 3 files changed, 8 insertions(+), 2 deletions(-) rename mkosi.finalize => mkosi.finalize.chroot (100%) rename mkosi.prepare => mkosi.prepare.chroot (100%) diff --git a/mkosi.finalize b/mkosi.finalize.chroot similarity index 100% rename from mkosi.finalize rename to mkosi.finalize.chroot diff --git a/mkosi.postinst b/mkosi.postinst index 5898f77..6dd99f7 100755 --- a/mkosi.postinst +++ b/mkosi.postinst @@ -4,6 +4,12 @@ set -ex +env + +if [ "$container" != "mkosi" ]; then + exec mkosi-chroot "$CHROOT_SCRIPT" "$@" +fi + cat <<-EOF > /usr/lib/os-release NAME="systemdOS" PRETTY_NAME="systemdOS" @@ -15,7 +21,7 @@ DOCUMENTATION_URL="https://wiki.archlinux.org/" SUPPORT_URL="https://bbs.archlinux.org/" BUG_REPORT_URL="https://bugs.archlinux.org/" PRIVACY_POLICY_URL="https://terms.archlinux.org/docs/privacy-policy/" -LOGO=archlinux-logo +LOGO=kde-symbolic IMAGE_VERSION=$(cat /usr/lib/image_version) EOF @@ -27,7 +33,7 @@ cp /usr/share/edk2-shell/x64/Shell.efi /efi/shellx64.efi kernel_version="" for f in /usr/lib/modules/*/vmlinuz do - kernel_version="$(basename "$(dirname "$f")")" + kernel_version="$(basename "$(dirname "$f")")" done # dracut --uefi --no-machineid --kernel-cmdline "native ro" --kver "$kernel_version" systemdOS.efi # kernel-install add --verbose add "$kernel_version" "/usr/lib/modules/$kernel_version/vmlinuz" systemdOS.efi diff --git a/mkosi.prepare b/mkosi.prepare.chroot similarity index 100% rename from mkosi.prepare rename to mkosi.prepare.chroot