Pick the requested region whatever the ISO preselects; one-line comments
This commit is contained in:
1 parent
02ee068504
commit
0c75c60e19
3 files changed
+5
-9
No files matched your search
@@ -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.
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user