From 0c75c60e199844d76f3557827f67f718a6496364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?= Date: Wed, 7 Oct 2026 11:46:38 -0400 Subject: [PATCH] Pick the requested region whatever the ISO preselects; one-line comments --- bin/omarchy-iso-test | 4 ++-- builder/prepare-region.sh | 3 +-- configs/airootfs/root/configurator | 7 ++----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/bin/omarchy-iso-test b/bin/omarchy-iso-test index e70d569..004afd7 100755 --- a/bin/omarchy-iso-test +++ b/bin/omarchy-iso-test @@ -645,10 +645,10 @@ drive_configurator() { capture_console "success-installer-00-greeter" press ret - # Region comes first, Global preselected and China one row below. + # Region comes first: Global on top, China below, either one preselected. wait_for_screen "Select region" 300 capture_console "success-installer-01-region" - [[ $REGION == "cn" ]] && press down + if [[ $REGION == "cn" ]]; then press end; else press home; fi press ret # Global asks for the keyboard; China reruns in cage + foot on a bilingual region screen with a US keyboard. Ctrl+C on either defers provisioning. diff --git a/builder/prepare-region.sh b/builder/prepare-region.sh index 0e530e1..9172d7e 100644 --- a/builder/prepare-region.sh +++ b/builder/prepare-region.sh @@ -22,8 +22,7 @@ if [[ ! -f $runtime/bin/omarchy-apply-pacman || ! -f $profile/packages || exit 1 fi -# The offline mirror carries the profile packages; the installer adds them to -# the target only when the person picks this region. +# Offline mirror only; the installer adds them when China is picked. payload="$iso_root/usr/share/omarchy-iso" cp -a "$profile" "$payload/region" printf '\n' >> "$payload/omarchy-other.packages" diff --git a/configs/airootfs/root/configurator b/configs/airootfs/root/configurator index 26c1613..e317e8d 100644 --- a/configs/airootfs/root/configurator +++ b/configs/airootfs/root/configurator @@ -91,9 +91,7 @@ OMARCHY_ZH+=( ["Everything will be overwritten. There is no recovery possible."]="磁盘上的一切都会被覆盖,无法恢复。" ["Confirm overwriting %s"]="确认覆盖 %s" ) -# Every ISO carries the cn profile here (builder/prepare-region.sh copies it); -# China preselects its timezone when there is no geo guess, which is every -# offline install. +# China preselects the bundled cn profile's timezone when geo guessing fails. REGION_TIMEZONE="${REGION_TIMEZONE:-/usr/share/omarchy-iso/region/timezone}" region_timezone() { if [[ $region == "cn" ]]; then @@ -1141,8 +1139,7 @@ select_installation() { defer_provisioning=false install_target="full_disk" -# A rerun in the other console arrives with the region already chosen; a -# regional build preselects its own. +# A rerun arrives with the region chosen; otherwise the ISO's default. region="${OMARCHY_INSTALL_REGION:-$(<"${ISO_REGION_FILE:-/root/omarchy_region}")}" # Let the live VT reach its settled width before the first screen so the logo