Restore keyboard→user→disk order; drop OEM wording from the configurator UI

The normal install flow returns to its original order: keyboard, then the
user step, then disk selection and mode. The Ctrl+C shortcut on the first
screen and its confirmation now speak only of preparing the machine for
another owner — no 'OEM' in any user-facing string (the omarchy_install.oem
data contract is unchanged).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
David Heinemeier HanssonandClaude Fable 5 committed 2026-08-08 01:14:56 -07:00
1 parent 2f54e5579b
commit 57beb18b72
2 files changed
+50 -48

No files matched your search

+36 -35
View File
@@ -612,22 +612,22 @@ drive_configurator() {
capture_console "success-installer-01-keyboard-layout" capture_console "success-installer-01-keyboard-layout"
if $OEM; then if $OEM; then
press ctrl-c # arm OEM mode press ctrl-c # arm "prepare for another owner"
wait_for_screen "new owner" 30 wait_for_screen "another owner" 30
capture_console "success-installer-02-oem-confirm" capture_console "success-installer-02-prepare-confirm"
press ret # "Yes, prepare for a new owner" is the affirmative default press ret # "Yes, prepare for another owner" is the affirmative default
# OEM jumps straight to disk selection, then the overwrite confirm. # Jumps straight to disk selection, then the overwrite confirm.
wait_for_screen "install disk" 60 wait_for_screen "install disk" 60
capture_console "success-installer-03-oem-install-disk" capture_console "success-installer-03-prepare-install-disk"
press ret press ret
wait_for_screen "recovery possible" 60 wait_for_screen "recovery possible" 60
capture_console "success-installer-04-oem-disk-warning-encrypted" capture_console "success-installer-04-prepare-disk-warning-encrypted"
if ! $ENCRYPT; then if ! $ENCRYPT; then
press ctrl-c press ctrl-c
wait_for_screen "without encryption" 30 wait_for_screen "without encryption" 30
capture_console "success-installer-05-oem-disk-warning-unencrypted" capture_console "success-installer-05-prepare-disk-warning-unencrypted"
fi fi
press ret press ret
sleep 2 sleep 2
@@ -637,61 +637,62 @@ drive_configurator() {
press ret # English (US) is preselected press ret # English (US) is preselected
wait_for_screen "install disk" 60 # Normal flow: user step comes before disk selection.
capture_console "success-installer-02-install-disk"
press ret # the single virtio disk
wait_for_screen "installation mode\|recovery possible" 60
if ocr_screen | grep -qi "installation mode"; then
capture_console "success-installer-03-install-mode"
press ret # "Full disk install" is preselected
fi
wait_for_screen "recovery possible" 60
capture_console "success-installer-04-disk-warning-encrypted"
if ! $ENCRYPT; then
press ctrl-c # toggles the confirm to the unencrypted flow
wait_for_screen "without encryption" 30
capture_console "success-installer-05-disk-warning-unencrypted"
fi
press ret
wait_for_screen "Username" 120 wait_for_screen "Username" 120
type_text "$GUEST_USER" type_text "$GUEST_USER"
capture_console "success-installer-06-username" capture_console "success-installer-02-username"
press ret press ret
wait_for_screen "Password" 60 wait_for_screen "Password" 60
type_text "$GUEST_PASSWORD" type_text "$GUEST_PASSWORD"
capture_console "success-installer-07-password" capture_console "success-installer-03-password"
press ret press ret
wait_for_screen "Must match" 60 wait_for_screen "Must match" 60
type_text "$GUEST_PASSWORD" type_text "$GUEST_PASSWORD"
capture_console "success-installer-08-password-confirmation" capture_console "success-installer-04-password-confirmation"
press ret press ret
wait_for_screen "Full name" 60 wait_for_screen "Full name" 60
type_text "Omarchy Test" type_text "Omarchy Test"
capture_console "success-installer-09-full-name" capture_console "success-installer-05-full-name"
press ret press ret
wait_for_screen "Email address" 60 wait_for_screen "Email address" 60
type_text "test@omarchy.org" type_text "test@omarchy.org"
capture_console "success-installer-10-email" capture_console "success-installer-06-email"
press ret press ret
wait_for_screen "Hostname" 60 wait_for_screen "Hostname" 60
type_text "$GUEST_HOSTNAME" type_text "$GUEST_HOSTNAME"
capture_console "success-installer-11-hostname" capture_console "success-installer-07-hostname"
press ret press ret
wait_for_screen "Timezone" 180 # tzupdate geo-guess can take a moment wait_for_screen "Timezone" 180 # tzupdate geo-guess can take a moment
capture_console "success-installer-12-timezone" capture_console "success-installer-08-timezone"
press ret press ret
wait_for_screen "look right" 60 wait_for_screen "look right" 60
capture_console "success-installer-13-review" capture_console "success-installer-09-review"
press ret
wait_for_screen "install disk" 60
capture_console "success-installer-10-install-disk"
press ret # the single virtio disk
wait_for_screen "installation mode\|recovery possible" 60
if ocr_screen | grep -qi "installation mode"; then
capture_console "success-installer-11-install-mode"
press ret # "Full disk install" is preselected
fi
wait_for_screen "recovery possible" 60
capture_console "success-installer-12-disk-warning-encrypted"
if ! $ENCRYPT; then
press ctrl-c # toggles the confirm to the unencrypted flow
wait_for_screen "without encryption" 30
capture_console "success-installer-13-disk-warning-unencrypted"
fi
press ret press ret
sleep 2 sleep 2
+14 -13
View File
@@ -81,7 +81,7 @@ keyboard_form() {
# Ctrl+C there can't flip an in-progress user install into OEM. # Ctrl+C there can't flip an in-progress user install into OEM.
local allow_oem="${1:-false}" local allow_oem="${1:-false}"
if $allow_oem; then if $allow_oem; then
say --foreground 8 "Press Ctrl+C to prepare this machine for a new owner (OEM install)." say --foreground 8 "Press Ctrl+C to prepare this machine for another owner."
echo echo
fi fi
@@ -139,11 +139,11 @@ Ukrainian|ua'
local status=$? local status=$?
if $allow_oem && (( status == 130 )); then if $allow_oem && (( status == 130 )); then
if confirm_oem_install; then if confirm_prepare_for_another_owner; then
oem_install=true oem_install=true
return 0 return 0
fi fi
keyboard_form true # declined OEM: back to the keyboard picker keyboard_form true # declined: back to the keyboard picker
return return
fi fi
(( status == 0 )) || abort (( status == 0 )) || abort
@@ -157,17 +157,18 @@ Ukrainian|ua'
fi fi
} }
# Ctrl+C on the first screen offers OEM mode. Confirm it before committing, so # Ctrl+C on the first screen offers to prepare the machine for another owner.
# an accidental Ctrl+C doesn't silently switch the whole install. # Confirm it before committing, so an accidental Ctrl+C doesn't silently switch
confirm_oem_install() { # the whole install.
confirm_prepare_for_another_owner() {
clear_logo clear_logo
echo echo
say "OEM install prepares this machine for someone else." say "This prepares the machine for another owner."
say --foreground 8 "The system installs now, but the new owner picks their keyboard and" say --foreground 8 "The system installs now, but they pick their keyboard and create"
say --foreground 8 "creates their user on the machine's first boot." say --foreground 8 "their user on the machine's first boot."
echo echo
gum confirm --affirmative "Yes, prepare for a new owner" --negative "No, keep setting up" \ gum confirm --affirmative "Yes, prepare for another owner" --negative "No, keep setting up" \
"Prepare this machine for a new owner?" "Prepare this machine for another owner?"
} }
# The user step. OEM installs skip it entirely — the machine's first owner # The user step. OEM installs skip it entirely — the machine's first owner
@@ -958,12 +959,12 @@ if $oem_install; then
done done
install_target="full_disk" install_target="full_disk"
else else
# Normal install: pick the disk, then the install mode, then the user. The # Normal install: keyboard (done above) → user → disk → install mode. The
# keyboard chosen above is already loaded, so the LUKS passphrase entered in # keyboard chosen above is already loaded, so the LUKS passphrase entered in
# the user step is typed under the right layout. # the user step is typed under the right layout.
user_step
disk_form disk_form
select_installation select_installation
user_step
fi fi
clear clear