From 1bf35ab5670e947ade8fd7faa9a74bcd63f3dfba Mon Sep 17 00:00:00 2001 From: ruihan Date: Fri, 30 Oct 2026 04:32:35 -0300 Subject: [PATCH] fix(heal): restore Rosetta access on intact installations --- lib/heal.sh | 4 ++++ tests/test_rosetta.bats | 36 +++++++++++++++++++++++++++++++++--- unleash-standalone.sh | 4 ++++ 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/lib/heal.sh b/lib/heal.sh index cfa8567..718e3b5 100644 --- a/lib/heal.sh +++ b/lib/heal.sh @@ -8,6 +8,10 @@ heal_suppress() { local hosts="${data_mount}/private/etc/hosts" local ldp="${data_mount}/private/var/db/com.apple.xpc.launchd/disabled.plist" + if [ "$DRY_RUN" != true ] && [ -f "$hosts" ]; then + _restore_rosetta_hosts "$hosts" || error_exit "Could not repair old Rosetta hosts blocks." + fi + local needs_heal=false if [ -f "$cfg/.cloudConfigRecordFound" ]; then diff --git a/tests/test_rosetta.bats b/tests/test_rosetta.bats index e1e4b5c..869bc2c 100644 --- a/tests/test_rosetta.bats +++ b/tests/test_rosetta.bats @@ -2,14 +2,44 @@ suppress_fixture() { local script="$1" target="$2" + local action="${3:-suppress_enrollment}" simulation="${4:-false}" run bash -u -c ' source <(sed '\''/^main "\$@"$/d'\'' "$1") - PB=: - suppress_enrollment "$2" - ' "$script" "$script" "$target" + DRY_RUN="$4" + "$3" "$2" + ' "$script" "$script" "$target" "$action" "$simulation" [ "$status" -eq 0 ] } +@test "heal repairs old Rosetta blocks even when suppression is otherwise intact" { + local entrypoint + for entrypoint in unleash unleash-standalone.sh; do + local script="$BATS_TEST_DIRNAME/../$entrypoint" + local target="$BATS_TEST_TMPDIR/$entrypoint" hosts + hosts="$target/private/etc/hosts" + suppress_fixture "$script" "$target" + printf '0.0.0.0 configuration.apple.com\n:: configuration.apple.com\n' >> "$hosts" + suppress_fixture "$script" "$target" heal_suppress + run grep -q 'configuration[.]apple[.]com' "$hosts" + [ "$status" -eq 1 ] + done +} + +@test "heal dry run preserves old Rosetta entries" { + local entrypoint + for entrypoint in unleash unleash-standalone.sh; do + local script="$BATS_TEST_DIRNAME/../$entrypoint" + local target="$BATS_TEST_TMPDIR/$entrypoint" hosts + hosts="$target/private/etc/hosts" + suppress_fixture "$script" "$target" + printf '0.0.0.0 configuration.apple.com\n:: configuration.apple.com\n' >> "$hosts" + cp "$hosts" "$target/original" + suppress_fixture "$script" "$target" heal_suppress true + cmp "$target/original" "$hosts" + [ ! -e "$hosts.unleash-rosetta.bak" ] + done +} + @test "suppression does not add hosts blocks for Rosetta configuration" { local entrypoint for entrypoint in unleash unleash-standalone.sh; do diff --git a/unleash-standalone.sh b/unleash-standalone.sh index 4beacf1..6904e9d 100755 --- a/unleash-standalone.sh +++ b/unleash-standalone.sh @@ -990,6 +990,10 @@ heal_suppress() { local hosts="${data_mount}/private/etc/hosts" local ldp="${data_mount}/private/var/db/com.apple.xpc.launchd/disabled.plist" + if [ "$DRY_RUN" != true ] && [ -f "$hosts" ]; then + _restore_rosetta_hosts "$hosts" || error_exit "Could not repair old Rosetta hosts blocks." + fi + local needs_heal=false if [ -f "$cfg/.cloudConfigRecordFound" ]; then