mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 12:00:37 +02:00
add correct loop for multiple bootloader installation in uefi mode
This commit is contained in:
parent
09ca835c56
commit
b8142669c3
1 changed files with 16 additions and 18 deletions
|
@ -3310,7 +3310,7 @@ do_uefi_common() {
|
||||||
[[ ! -f "${DESTDIR}/usr/lib/prebootloader/PreLoader.efi" ]] && PACKAGES="${PACKAGES} prebootloader"
|
[[ ! -f "${DESTDIR}/usr/lib/prebootloader/PreLoader.efi" ]] && PACKAGES="${PACKAGES} prebootloader"
|
||||||
[[ ! -f "${DESTDIR}/usr/lib/lockdown-ms/LockDown_ms.efi" ]] && PACKAGES="${PACKAGES} lockdown-ms"
|
[[ ! -f "${DESTDIR}/usr/lib/lockdown-ms/LockDown_ms.efi" ]] && PACKAGES="${PACKAGES} lockdown-ms"
|
||||||
fi
|
fi
|
||||||
run_pacman
|
! [[ "${PACKAGES}" == "" ]] && run_pacman
|
||||||
unset PACKAGES
|
unset PACKAGES
|
||||||
|
|
||||||
check_efisys_part
|
check_efisys_part
|
||||||
|
@ -5030,28 +5030,26 @@ install_bootloader() {
|
||||||
prepare_pacman
|
prepare_pacman
|
||||||
CANCEL=""
|
CANCEL=""
|
||||||
|
|
||||||
[[ "${_DIRECT}" == "" ]] && export _DIRECT="0"
|
|
||||||
export _ANOTHER="1"
|
|
||||||
|
|
||||||
detect_uefi_boot
|
detect_uefi_boot
|
||||||
|
|
||||||
if [[ "${_DETECTED_UEFI_BOOT}" == "1" ]] && [[ "${_DIRECT}" != "1" ]]; then
|
if [[ "${_DETECTED_UEFI_BOOT}" == "1" ]]; then
|
||||||
do_uefi_setup_env_vars
|
do_uefi_setup_env_vars
|
||||||
|
_ANOTHER="1"
|
||||||
DIALOG --yesno "Setup has detected that you are using ${_UEFI_ARCH} UEFI ...\nDo you like to install a ${_UEFI_ARCH} UEFI bootloader?" 0 0 && export _DIRECT="1"
|
while [[ "${_ANOTHER}" == "1" ]]; do
|
||||||
|
_DIRECT=""
|
||||||
|
DIALOG --yesno "Setup has detected that you are using ${_UEFI_ARCH} UEFI ...\nDo you like to install a ${_UEFI_ARCH} UEFI bootloader?" 0 0 && _DIRECT="1"
|
||||||
|
|
||||||
if [[ "${_DIRECT}" == "1" ]]; then
|
if [[ "${_DIRECT}" == "1" ]]; then
|
||||||
install_bootloader_uefi
|
install_bootloader_uefi
|
||||||
|
else
|
||||||
export _ANOTHER="0"
|
install_bootloader_menu
|
||||||
DIALOG --yesno "Do you want to install another bootloader?" 0 0 && export _ANOTHER="1"
|
fi
|
||||||
fi
|
_ANOTHER="0"
|
||||||
fi
|
DIALOG --defaultno --yesno "Do you want to install another bootloader?" 0 0 && _ANOTHER="1"
|
||||||
|
done
|
||||||
if [[ "${_ANOTHER}" == "1" ]]; then
|
else
|
||||||
install_bootloader_menu
|
install_bootloader_menu
|
||||||
fi
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
install_bootloader_menu() {
|
install_bootloader_menu() {
|
||||||
|
|
Loading…
Reference in a new issue