usr/lib/archboot/installer/autoprepare.sh

@@ -284,7 +284,7 @@ _autoprepare() {
             btrfs subvolume set-default "${_DESTDIR}"/"${_MP}" || return 1
         fi
     done
-    _dialog --infobox "Quick Setup was successful.\nContinuing in 5 seconds..." 4 40
+    _dialog --infobox "Auto-Prepare was successful.\nContinuing in 5 seconds..." 4 40
     sleep 5
     _S_MKFSAUTO=1
 }

usr/lib/archboot/installer/base.sh

@@ -62,10 +62,6 @@ _abort_running_system() {
     _dialog --msgbox "This function is not available on System Setup Mode." 5 60
 }
 
-_abort_offline_mode() {
-    _dialog --msgbox "This function is not available on Offline Mode." 5 60
-}
-
 _geteditor() {
     if ! [[ "${_EDITOR}" ]]; then
         _dialog --menu "Select A Text Editor" 9 35 3 \
@@ -299,16 +295,10 @@ _mainmenu() {
         "0")
             _set_vconsole ;;
         "1")
-            if [[ -e "/var/cache/pacman/pkg/archboot.db" ]]; then
-                _abort_offline_mode
-            else
-                _donetwork
-            fi ;;
+            _donetwork ;;
         "2")
             if [[ "${_DESTDIR}" == "/" ]]; then
                 _abort_running_system
-            elif [[ -e "/var/cache/pacman/pkg/archboot.db" ]]; then
-                _abort_offline_mode
             else
                 _select_source || return 1
                 _update_environment

usr/lib/archboot/installer/bootloader.sh

@@ -944,10 +944,7 @@ _install_bootloader_uefi() {
         _EFISTUB_MENU_LABEL="EFISTUB"
         _EFISTUB_MENU_TEXT="EFISTUB for ${_UEFI_ARCH} UEFI"
     fi
-    # aarch64 is broken for UKI and systemd-boot
-    # https://github.com/systemd/systemd/issues/27837
-    # https://sourceforge.net/p/gnu-efi/bugs/37/
-    if [[ -n "${_UEFI_SECURE_BOOT}" || "${_RUNNING_ARCH}" == "aarch64" ]]; then
+    if [[ -n "${_UEFI_SECURE_BOOT}" ]]; then
         _do_grub_uefi
     else
         _dialog --menu "Which ${_UEFI_ARCH} UEFI bootloader would you like to use?" 9 55 3 \

usr/lib/archboot/installer/common.sh

@@ -24,7 +24,7 @@ if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then
     _VMLINUZ_EFISTUB="Image"
 fi
 # abstract the common pacman args
-_PACMAN="pacman --root ${_DESTDIR} --cachedir=${_DESTDIR}/var/cache/pacman/pkg --noconfirm --noprogressbar"
+_PACMAN="pacman --root ${_DESTDIR} ${_PACMAN_CONF} --cachedir=${_DESTDIR}/var/cache/pacman/pkg --noconfirm --noprogressbar"
 _MIRRORLIST="/etc/pacman.d/mirrorlist"
 
 _linux_firmware() {
@@ -88,7 +88,6 @@ _local_pacman_conf() {
     echo "[archboot]" >> "${_PACMAN_CONF}"
     echo "Server = file:///var/cache/pacman/pkg" >> "${_PACMAN_CONF}"
     _PACMAN_CONF="--config ${_PACMAN_CONF}"
-    _PACMAN="pacman --root ${_DESTDIR} ${_PACMAN_CONF} --cachedir=${_DESTDIR}/var/cache/pacman/pkg --noconfirm --noprogressbar"
 }
 
 _auto_packages() {

usr/lib/archboot/installer/pacman.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+f#!/usr/bin/env bash
 # SPDX-License-Identifier: GPL-2.0-only
 # created by Tobias Powalowski <tpowa@archlinux.org>
 _getsource() {
@@ -127,6 +127,11 @@ _prepare_pacman() {
         sleep 1
     done
     [[ -e /etc/systemd/system/pacman-init.service ]] && systemctl stop pacman-init.service
+    _dialog --infobox "Refreshing package database..." 3 40
+    if ! ${_PACMAN} -Sy ${_PACMAN_CONF} &>"${_LOG}"; then
+        _dialog --msgbox "Pacman preparation failed! Check ${_LOG} for errors." 6 60
+        return 1
+    fi
     _dialog --infobox "Update Arch Linux keyring..." 3 40
     _KEYRING="archlinux-keyring"
     [[ "${_RUNNING_ARCH}" == "aarch64" ]] && _KEYRING="${_KEYRING} archlinuxarm-keyring"

usr/lib/archboot/login.sh

@@ -15,9 +15,6 @@ _local_mode () {
     if [[ -e "${_CACHEDIR}/archboot.db" ]]; then
         echo -e "You are running in \e[92m\e[1mLocal Mode\e[m, with \e[1mlocal package repository\e[m enabled.\e[m"
         if [[ -e /usr/bin/setup ]] ; then
-            # bring down network
-            systemctl stop systemd-networkd 2>/dev/null
-            systemctl stop systemd-resolved 2>/dev/null
             echo -e "To \e[1mswitch\e[m to \e[1mOnline Mode\e[m:\e[1m\e[91m# rm ${_CACHEDIR}/archboot.db\e[m\e[1m"
             echo ""
         fi

usr/share/archboot/base/init

@@ -108,11 +108,8 @@ cd /sysroot || _emergency_shell
 bsdcpio -u -f "*/lib/modules/" -f "*/lib/firmware/" -i <"/mnt/boot/initramfs-$(uname -m).img" &>/dev/null || _emergency_shell
 # unmount everything after copying
 echo -e "\e[1mStep 7/7:\e[m Unmounting archboot rootfs..."
-while true; do
-    umount -q -A /dev/sr0 2>/dev/null && break
-    umount -q -A UUID=1234-ABCD 2>/dev/null && break
-    read -r -t 1
-done
+umount -q -A /dev/sr0
+umount -q -A UUID=1234-ABCD
 echo 0 > /proc/sys/kernel/sysrq
 # set font size in vconsole.conf
 echo FONT=ter-v${SIZE}n >> /sysroot/etc/vconsole.conf