diff --git a/configs/airootfs/usr/local/bin/omarchy-iso-install b/configs/airootfs/usr/local/bin/omarchy-iso-install index ae3a680..3b1de13 100755 --- a/configs/airootfs/usr/local/bin/omarchy-iso-install +++ b/configs/airootfs/usr/local/bin/omarchy-iso-install @@ -6,11 +6,6 @@ set -eEo pipefail -# Patch archinstall BEFORE Python loads it. phases_impl.py imports -# archinstall_adapter, which imports archinstall.*; patching inside a phase -# would be too late (bytecode already loaded). -omarchy-iso-patch-archinstall - # Parse our args; convert to env vars before exec'ing Python so archinstall's # own argparse (which runs at module import time inside the orchestrator) # doesn't choke on flags it doesn't recognize. diff --git a/configs/airootfs/usr/local/bin/omarchy-iso-patch-archinstall b/configs/airootfs/usr/local/bin/omarchy-iso-patch-archinstall deleted file mode 100755 index 462dfaf..0000000 --- a/configs/airootfs/usr/local/bin/omarchy-iso-patch-archinstall +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -# -# Patch upstream archinstall in place for two Python 3.14 / archinstall 4.3 -# bugs that hit our flow: -# -# 1. logfile_target join: '/' on an absolute Path with another absolute Path -# raises. Strip leading slash so the join produces target / "var/log/..." -# instead of throwing. -# -# 2. Limine EFI copy: archinstall passes the destination directory but limine -# .copy() expects the destination file path. Two sites: limine_x64.efi -# copy and limine-bios.sys copy. -# -# Idempotent: re-running is a no-op (sed only matches the buggy form). Carry -# this until upstream Arch's packaged archinstall has the fixes. - -set -eEo pipefail - -target="/usr/lib/python3.14/site-packages/archinstall/lib/installer.py" -[[ -f $target ]] || { echo "archinstall installer.py not found at $target" >&2; exit 1; } - -sed -i \ - -e 's|logfile_target = self\.target / absolute_logfile$|logfile_target = self.target / absolute_logfile.relative_to("/")|' \ - -e 's|(limine_path / file)\.copy(efi_dir_path)|(limine_path / file).copy(efi_dir_path / file)|' \ - -e "s|(limine_path / 'limine-bios.sys')\.copy(boot_limine_path)|(limine_path / 'limine-bios.sys').copy(boot_limine_path / 'limine-bios.sys')|" \ - "$target" diff --git a/configs/profiledef.sh b/configs/profiledef.sh index eefc9ff..6c207a4 100644 --- a/configs/profiledef.sh +++ b/configs/profiledef.sh @@ -23,7 +23,6 @@ file_permissions=( ["/usr/local/bin/choose-mirror"]="0:0:755" ["/usr/local/bin/omarchy-iso-cleanup-disk"]="0:0:755" ["/usr/local/bin/omarchy-iso-install"]="0:0:755" - ["/usr/local/bin/omarchy-iso-patch-archinstall"]="0:0:755" ["/usr/local/bin/omarchy-upload-log"]="0:0:755" ["/var/cache/omarchy/mirror/offline/"]="0:0:775" )