root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 12:00:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

don't ask for bootloader installation, show menu of detected system

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-05 21:24:05 +01:00
parent 80036a3d12
commit f78fd4ccce
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
usr/lib/archboot/installer/bootloader.sh
View file

@ -1057,31 +1057,29 @@ install_bootloader() {
select_source || return 1 select_source || return 1
fi fi
prepare_pacman prepare_pacman
CANCEL=""
detect_uefi_boot detect_uefi_boot
_ANOTHER="1"
NEXTITEM="7" NEXTITEM="7"
if [[ "${_DETECTED_UEFI_BOOT}" == "1" ]]; then if [[ "${_DETECTED_UEFI_BOOT}" == "1" ]]; then
do_uefi_setup_env_vars do_uefi_setup_env_vars
_ANOTHER="0" install_bootloader_uefi || return 1
if [[ "${_DETECTED_UEFI_SECURE_BOOT}" == "1" ]]; then if [[ "${_DETECTED_UEFI_SECURE_BOOT}" == "1" ]]; then
DIALOG --yesno "Setup has detected that you are using Secure Boot.\n\nDo you like to install SHIM and GRUB(2) ${_UEFI_ARCH} UEFI bootloader?" 7 70 || CANCEL="1"
if [[ "${CANCEL}" == "" ]]; then
install_bootloader_uefi || return 1
NEXTITEM="8"
else
NEXTITEM="7"
fi
else
DIALOG --yesno "Setup has detected that you are using ${_UEFI_ARCH} UEFI.\nDo you like to install a ${_UEFI_ARCH} UEFI bootloader?" 0 0 && install_bootloader_uefi
DIALOG --defaultno --yesno "Do you want to install another bootloader?" 5 50 && _ANOTHER="1"
NEXTITEM="8" NEXTITEM="8"
else
_ANOTHER="1"
fi fi
else
install_bootloader_menu || return 1
_ANOTHER="1"
fi fi
while [[ "${_ANOTHER}" == "1" ]]; do while [[ "${_ANOTHER}" == "1" ]]; do
install_bootloader_menu NEXTITEM="7"
_ANOTHER="0" if $(DIALOG --defaultno --yesno "Do you want to install another bootloader?" 5 50); then
DIALOG --defaultno --yesno "Do you want to install another bootloader?" 5 50 && _ANOTHER="1" install_bootloader_menu || return 1
_ANOTHER="1"
else
_ANOTHER=""
NEXTITEM="8"
fi
done done
} }