diff --git a/usr/lib/archboot/installer/autoconfiguration.sh b/usr/lib/archboot/installer/autoconfiguration.sh index de9af5136..c7353ecb4 100644 --- a/usr/lib/archboot/installer/autoconfiguration.sh +++ b/usr/lib/archboot/installer/autoconfiguration.sh @@ -232,14 +232,14 @@ _auto_mkinitcpio() { _dialog --defaultno --yesno "Setup detected nfs driver...\nDo you need support for booting from nfs shares?" 0 0 && _HWPARAMETER="${_HWPARAMETER} --nfs" fi _dialog --no-mouse --infobox "" 3 70 - _auto_hwdetect | _dialog --title " Logging to ${_LOG} " --gauge "Preconfiguring mkinitcpio settings on installed system..." 6 75 0 + _auto_hwdetect | _dialog --title " Logging to ${VC} | ${_LOG} " --gauge "Preconfiguring mkinitcpio settings on installed system..." 6 75 0 # disable fallpack preset sed -i -e "s# 'fallback'##g" "${_DESTDIR}"/etc/mkinitcpio.d/*.preset # remove fallback initramfs [[ -e "${_DESTDIR}/boot/initramfs-linux-fallback.img" ]] && rm -f "${_DESTDIR}/boot/initramfs-linux-fallback.img" sleep 2 _AUTO_MKINITCPIO=1 - _run_mkinitcpio | _dialog --title " Logging to ${_LOG} " --gauge "Rebuilding initramfs on installed system..." 6 75 0 + _run_mkinitcpio | _dialog --title " Logging to ${VC} | ${_LOG} " --gauge "Rebuilding initramfs on installed system..." 6 75 0 _mkinitcpio_error _printk on fi diff --git a/usr/lib/archboot/installer/base.sh b/usr/lib/archboot/installer/base.sh index 9b861ae70..cca85bcf7 100644 --- a/usr/lib/archboot/installer/base.sh +++ b/usr/lib/archboot/installer/base.sh @@ -64,7 +64,7 @@ _geteditor() { "NANO") _EDITOR="nano" if ! [[ -f "${_DESTDIR}/usr/bin/nano" ]]; then _PACKAGES="nano" - _run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0 + _run_pacman | _dialog --title " Logging to ${VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0 _pacman_error _dialog --no-mouse --infobox "Enable nano's syntax highlighting on installed system..." 3 70 grep -q '^include' "${_DESTDIR}/etc/nanorc" || \ @@ -75,7 +75,7 @@ _geteditor() { "NEOVIM") _EDITOR="nvim" if ! [[ -f "${_DESTDIR}/usr/bin/nvim" ]]; then _PACKAGES="nvim" - _run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0 + _run_pacman | _dialog --title " Logging to ${VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0 _pacman_error fi ;; diff --git a/usr/lib/archboot/installer/bootloader.sh b/usr/lib/archboot/installer/bootloader.sh index 432e3b5e6..47142f659 100644 --- a/usr/lib/archboot/installer/bootloader.sh +++ b/usr/lib/archboot/installer/bootloader.sh @@ -156,7 +156,7 @@ _do_uefi_common() { [[ -f "${_DESTDIR}/usr/bin/sbsign" ]] || _PACKAGES="${_PACKAGES} sbsigntools" fi if [[ -n "${_PACKAGES}" ]]; then - _run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0 + _run_pacman | _dialog --title " Logging to ${VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0 _pacman_error fi # automounted /boot and ESP needs to be mounted first, trigger mount with ls @@ -414,7 +414,7 @@ GUMEOF _geteditor || return 1 "${_EDITOR}" "${_DESTDIR}/${_UEFISYS_MP}/loader/entries/archlinux-core-main.conf" "${_EDITOR}" "${_DESTDIR}/${_UEFISYS_MP}/loader/loader.conf" - _do_efistub_copy_to_efisys | _dialog --title " Logging to ${_LOG} " --gauge "Copying kernel, ucode and initramfs to EFI SYSTEM PARTITION now..." 6 75 0 + _do_efistub_copy_to_efisys | _dialog --title " Logging to ${VC} | ${_LOG} " --gauge "Copying kernel, ucode and initramfs to EFI SYSTEM PARTITION now..." 6 75 0 _dialog --title " Success " --no-mouse --infobox "SYSTEMD-BOOT has been setup successfully." 3 50 sleep 3 _S_BOOTLOADER=1 @@ -426,7 +426,7 @@ GUMEOF _do_refind_uefi() { if [[ ! -f "${_DESTDIR}/usr/bin/refind-install" ]]; then _PACKAGES="refind" - _run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0 + _run_pacman | _dialog --title " Logging to ${VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0 _pacman_error fi _dialog --no-mouse --infobox "Setting up rEFInd now..." 3 60 @@ -465,7 +465,7 @@ CONFEOF _geteditor || return 1 "${_EDITOR}" "${_REFIND_CONFIG}" cp -f "${_REFIND_CONFIG}" "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/" - _do_efistub_copy_to_efisys | _dialog --title " Logging to ${_LOG} " --gauge "Copying kernel, ucode and initramfs to EFI SYSTEM PARTITION now..." 6 75 0 + _do_efistub_copy_to_efisys | _dialog --title " Logging to ${VC} | ${_LOG} " --gauge "Copying kernel, ucode and initramfs to EFI SYSTEM PARTITION now..." 6 75 0 _dialog --title " Success " --no-mouse --infobox "rEFInd has been setup successfully." 3 50 sleep 3 _S_BOOTLOADER=1 @@ -510,7 +510,7 @@ CONFEOF _do_uki_uefi() { if [[ ! -f "${_DESTDIR}/usr/lib/systemd/ukify" ]]; then _PACKAGES="systemd-ukify" - _run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0 + _run_pacman | _dialog --title " Logging to ${VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0 _pacman_error fi _UKIFY_CONFIG="${_DESTDIR}/etc/ukify.conf" @@ -533,7 +533,7 @@ CONFEOF "${_EDITOR}" "${_UKIFY_CONFIG}" ${_NSPAWN} /usr/bin/bash -c "source /etc/ukify.conf" >>"${_LOG}" if [[ -e "${_DESTDIR}/${_UEFISYS_MP}/EFI/Linux/archlinux-linux.efi" ]]; then - _uki_uefi | _dialog --title " Logging to ${_LOG} " --gauge "Setting up Unified Kernel Image..." 6 75 0 + _uki_uefi | _dialog --title " Logging to ${VC} | ${_LOG} " --gauge "Setting up Unified Kernel Image..." 6 75 0 else _dialog --title " ERROR " --no-mouse --infobox "Setting up Unified Kernel Image failed!" 3 60 sleep 3 @@ -551,12 +551,12 @@ _do_grub_common_before() { _abort_f2fs_bootpart || return 1 if [[ ! -d "${_DESTDIR}/usr/lib/grub" ]]; then _PACKAGES="grub" - _run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0 + _run_pacman | _dialog --title " Logging to ${VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0 _pacman_error fi if [[ ! -f "${_DESTDIR}/usr/share/grub/ter-u16n.pf2" ]]; then _PACKAGES=terminus-font - _run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0 + _run_pacman | _dialog --title " Logging to ${VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0 _pacman_error fi } @@ -849,7 +849,7 @@ _do_grub_bios() { _dialog --msgbox "Error:\nGRUB(2) cannot boot from ${_BOOTDEV}, which contains /boot!\n\nPossible error sources:\n- encrypted devices are not supported" 0 0 return 1 fi - _grub_bios | _dialog --title " Logging to ${_LOG} " --gauge "Setting up GRUB(2) BIOS..." 6 75 0 + _grub_bios | _dialog --title " Logging to ${VC} | ${_LOG} " --gauge "Setting up GRUB(2) BIOS..." 6 75 0 mkdir -p "${_DESTDIR}/boot/grub/locale" cp -f "${_DESTDIR}/usr/share/locale/en@quot/LC_MESSAGES/grub.mo" "${_DESTDIR}/boot/grub/locale/en.mo" if [[ -e "${_DESTDIR}/boot/grub/i386-pc/core.img" ]]; then @@ -955,9 +955,9 @@ _do_grub_uefi() { _GRUB_PREFIX_DIR="/boot/grub/" fi _do_grub_common_before - _setup_grub_uefi | _dialog --title " Logging to ${_LOG} " --gauge "Setting up GRUB(2) UEFI..." 6 75 0 + _setup_grub_uefi | _dialog --title " Logging to ${VC} | ${_LOG} " --gauge "Setting up GRUB(2) UEFI..." 6 75 0 _do_grub_config || return 1 - _setup_grub_uefi_sb | _dialog --title " Logging to ${_LOG} " --gauge "Setting up GRUB(2) UEFI Secure Boot..." 6 75 0 + _setup_grub_uefi_sb | _dialog --title " Logging to ${VC} | ${_LOG} " --gauge "Setting up GRUB(2) UEFI Secure Boot..." 6 75 0 if [[ -e "${_DESTDIR}/${_UEFISYS_MP}/EFI/grub/grub${_SPEC_UEFI_ARCH}.efi" && -z "${_UEFI_SECURE_BOOT}" && -e "${_DESTDIR}/boot/grub/${_GRUB_ARCH}-efi/core.efi" ]]; then _BOOTMGR_LABEL="GRUB" _BOOTMGR_LOADER_PATH="/EFI/grub/grub${_SPEC_UEFI_ARCH}.efi" @@ -1022,7 +1022,7 @@ _install_bootloader() { if [[ -n "${_UCODE}" ]]; then if ! [[ -f "${_DESTDIR}/boot/${_UCODE}" ]]; then _PACKAGES="${_UCODE_PKG}" - _run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0 + _run_pacman | _dialog --title " Logging to ${VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 7 75 0 _pacman_error fi fi diff --git a/usr/lib/archboot/installer/configuration.sh b/usr/lib/archboot/installer/configuration.sh index e0a580752..266165e4c 100644 --- a/usr/lib/archboot/installer/configuration.sh +++ b/usr/lib/archboot/installer/configuration.sh @@ -61,7 +61,7 @@ _set_mkinitcpio() { _dialog --title " ERROR " --no-mouse --infobox "Detected error in 'HOOKS=' line,\nplease correct HOOKS= in /etc/mkinitcpio.conf!" 6 70 sleep 5 else - _run_mkinitcpio | _dialog --title " Logging to ${_LOG} " --gauge "Rebuilding initramfs on installed system..." 6 75 0 + _run_mkinitcpio | _dialog --title " Logging to ${VC} | ${_LOG} " --gauge "Rebuilding initramfs on installed system..." 6 75 0 _mkinitcpio_error fi } diff --git a/usr/lib/archboot/installer/pacman.sh b/usr/lib/archboot/installer/pacman.sh index 696e80819..33800617b 100644 --- a/usr/lib/archboot/installer/pacman.sh +++ b/usr/lib/archboot/installer/pacman.sh @@ -76,7 +76,7 @@ _install_packages() { # fix double spaces _PACKAGES="${_PACKAGES// / }" _dialog --title " Summary " --yesno "Next step will install the following packages for a minimal system:\n${_PACKAGES}\n\nYou can watch the progress on your ${_VC} console." 9 75 || return 1 - _run_pacman | _dialog --title " Logging to ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 8 75 0 + _run_pacman | _dialog --title " Logging to ${VC} | ${_LOG} " --gauge "Installing package(s):\n${_PACKAGES}..." 8 75 0 _pacman_error _NEXTITEM="3" _chroot_mount