From ac99a84d6c3b8d91b01f2ddf2d235eabc63a88a2 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 21 Aug 2025 11:32:19 +0200 Subject: [PATCH] Switch to using online configurator --- builder/cmds/autostart.sh | 1 + builder/cmds/configurator | 1 + builder/online.sh | 5 ++--- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 builder/cmds/configurator diff --git a/builder/cmds/autostart.sh b/builder/cmds/autostart.sh index fcb56f6..67fad8e 100644 --- a/builder/cmds/autostart.sh +++ b/builder/cmds/autostart.sh @@ -26,6 +26,7 @@ trap catch_errors ERR if [[ $(tty) == "/dev/tty1" ]]; then # Configurator for user information, disk selection, and wifi configuration + wget -qO configurator https://raw.githubusercontent.com/omacom-io/omarchy-configurator/HEAD/configurator NETWORK_NEEDED=1 ./configurator # Get username from installer config for reliable error recovery diff --git a/builder/cmds/configurator b/builder/cmds/configurator new file mode 100644 index 0000000..44512b5 --- /dev/null +++ b/builder/cmds/configurator @@ -0,0 +1 @@ +# Placeholder that'll be overwritten by online version diff --git a/builder/online.sh b/builder/online.sh index dc195a9..5a8502e 100755 --- a/builder/online.sh +++ b/builder/online.sh @@ -19,9 +19,8 @@ cp -r /archiso/configs/releng/* . # Add our needed packages to packages.x86_64 printf '%s\n' "${arch_packages[@]}" >>"packages.x86_64" -# Retrieve the latest configurator for setting up user and selecting install disk. -wget -qO "airootfs/root/configurator" \ - https://raw.githubusercontent.com/omacom-io/omarchy-configurator/HEAD/configurator +# Setup stub file for the configurator so we can give it the right permissions before downloading +cp /builder/cmds/configurator airootfs/root/configurator # Avoid using reflector for mirror identification as we are relying on the global CDN rm "airootfs/etc/systemd/system/multi-user.target.wants/reflector.service"