Repository navigation
Conversation
…OS identity
Backport aurora-silicon/m1n1 c6498e6e1a ("kboot: forward apfs-preboot-uuid
from ADT to FDT /chosen") onto the pinned v1.6.1 as a second patch, and bump
pkgrel. linux-aurora's SEP driver answers the enclave's GET_OS_UUID from
/chosen/apfs-preboot-uuid; without it Touch ID enrolment completes but the
final SAVE_CATACOMB is refused (status 0x6). Tested on a MacBook Air M1
(J313): the FDT carries the install's volume group UUID, the driver logs
"xART: using /chosen/apfs-preboot-uuid", and an enrolment restores after
reboot with sudo by fingerprint working.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
[Medium impact] The PR appears safe to merge; no actionable defects were established. SummaryBackports the preboot UUID forwarding change into the pinned
|
|
Closing as superseded, thanks @ludagoo. Master's omacom/omarchy-mac-pkgs#12's m1n1 prerequisite is met by master's package. |
Summary
Backport aurora-silicon/m1n1 c6498e6e1a ("kboot: forward apfs-preboot-uuid from ADT to FDT /chosen", 33 lines in
dt_set_chosen()) onto the pinned v1.6.1, as a second patch next toaurora-cio-aliases.patch.pkgrel3 → 4; the pin, the alias patch and the logos are unchanged.iBoot leaves the booted APFS volume group's UUID in the ADT as
/chosen/apfs-preboot-uuid. linux-aurora's Secure Enclave driver reads it from the FDT (dt::preboot_uuid()) and answers the enclave'sGET_OS_UUIDwith it; that UUID selects the install's anti-replay lane in the shared xART store. Without it the driver logsxART: /chosen/apfs-preboot-uuid is unavailableand answers "unavailable". The kernel team's release m1n1 (1.6.1.aurora13) carries the same commit, and their M2 Touch ID reports (omacom/linux-aurora#142, #145) showxART: using /chosen/apfs-preboot-uuid.Why it matters
On a MacBook Air M1 (J313) with Omarchy's m1n1-aurora 1.6.1.aurora1-3, Touch ID enrolment through
omarchy setup security fingerprint(omarchy-mac-pkgs#12 package, kernel with omacom/linux-aurora#180) captured the finger and then failed at the last step:SAVE_CATACOMB refused with status 0x6, "the fingerprint was enrolled but could not be recorded (driver status 6)". With the same stack and the identity supplied explicitly (apple_sep.os_uuid_hi/lo= that install's volume group, which is what this patch forwards), enrol, verify,sudo, hyprlock and s2idle all pass. omarchy-mac-pkgs#12 lists "m1n1 forwarding/chosen/apfs-preboot-uuid" as one of its blockers; this is that item.Test
Built with this recipe (
makepkg, clang 23 / lld, rustup 1.89.0) on a MacBook Air M1 (J313, OS firmware 13.5), installed over 1.6.1.aurora1-3; the asahi-scripts hook rebuiltboot.bin. Cold boot with the stage-2 version stillv1.6.1-omarchy.aurora1:/proc/device-tree/chosen/apfs-preboot-uuid=DE9C00BD-1A01-4E5C-A130-3208330EBF2F, which is the Omarchy stub's APFS volume group on this Mac (read from the volume superblocks of nvme0n1p3), so the forwarded identity is the install's own lane.apple_sep: xART: using /chosen/apfs-preboot-uuid, thenxarm: op 0x13 … reply_status 0x00(GET_OS_UUID answered) with noos_uuid_hi/lomodule parameters.Touch ID: restored 1 enrolled identity/identities; enrolment survived reboot: the finger enrolled on the previous boot under the explicit, identical UUID restored, andsudoby fingerprint passed on this boot.kboot.cchanged).Not tested: other Macs, external displays, the M3 handoff paths (unchanged code). The README's qualification (M1 Pro and M2 Max cold boot, two external displays) is the maintainers'; a build here is not that acceptance.
🤖 Generated with Claude Code