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

more bootloader message fixes

Browse source
This commit is contained in:
Tobias Powalowski 2022-03-22 12:08:09 +01:00
parent 75f16899e6
commit 3a5f547698
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -543,7 +543,7 @@ do_efistub_uefi() {
do_systemd_boot_uefi() { do_systemd_boot_uefi() {
DIALOG --infobox "Setting up Systemd-boot now..." 0 0 DIALOG --infobox "Setting up systemd-boot now..." 0 0
# create directory structure, if it doesn't exist # create directory structure, if it doesn't exist
! [[ -d "${DESTDIR}/${UEFISYS_MOUNTPOINT}/loader/entries" ]] && mkdir -p "${DESTDIR}/${UEFISYS_MOUNTPOINT}/loader/entries" ! [[ -d "${DESTDIR}/${UEFISYS_MOUNTPOINT}/loader/entries" ]] && mkdir -p "${DESTDIR}/${UEFISYS_MOUNTPOINT}/loader/entries"
@ -619,16 +619,14 @@ GUMEOF
} }
do_refind_uefi() { do_refind_uefi() {
DIALOG --infobox "Setting up refind now..." 0 0
if [[ ! -f "${DESTDIR}/usr/bin/refind-install" ]]; then if [[ ! -f "${DESTDIR}/usr/bin/refind-install" ]]; then
DIALOG --infobox "Couldn't find ${DESTDIR}/usr/bin/refind-install, installing refind pkg in 3 seconds ..." 0 0 DIALOG --infobox "Installing refind..." 0 0
sleep 3
PACKAGES="refind" PACKAGES="refind"
run_pacman run_pacman
fi fi
DIALOG --infobox "Setting up refind now..." 0 0
! [[ -d "${DESTDIR}/${UEFISYS_MOUNTPOINT}/EFI/refind" ]] && mkdir -p "${DESTDIR}/${UEFISYS_MOUNTPOINT}/EFI/refind/" ! [[ -d "${DESTDIR}/${UEFISYS_MOUNTPOINT}/EFI/refind" ]] && mkdir -p "${DESTDIR}/${UEFISYS_MOUNTPOINT}/EFI/refind/"
cp -f "${DESTDIR}/usr/share/refind/refind_${_SPEC_UEFI_ARCH}.efi" "${DESTDIR}/${UEFISYS_MOUNTPOINT}/EFI/refind/refind_${_SPEC_UEFI_ARCH}.efi" cp -f "${DESTDIR}/usr/share/refind/refind_${_SPEC_UEFI_ARCH}.efi" "${DESTDIR}/${UEFISYS_MOUNTPOINT}/EFI/refind/refind_${_SPEC_UEFI_ARCH}.efi"
cp -r "${DESTDIR}/usr/share/refind/icons" "${DESTDIR}/${UEFISYS_MOUNTPOINT}/EFI/refind/" cp -r "${DESTDIR}/usr/share/refind/icons" "${DESTDIR}/${UEFISYS_MOUNTPOINT}/EFI/refind/"
@ -664,7 +662,7 @@ REFINDEOF
DIALOG --msgbox "refind has been setup successfully." 0 0 DIALOG --msgbox "refind has been setup successfully." 0 0
DIALOG --msgbox "You will now be put into the editor to edit refind.conf and refind_linux.conf . After you save your changes, exit the editor." 0 0 DIALOG --msgbox "You will now be put into the editor to edit refind.conf and refind_linux.conf. After you save your changes, exit the editor." 0 0
geteditor || return 1 geteditor || return 1
"${EDITOR}" "${_REFIND_CONFIG}" "${EDITOR}" "${_REFIND_CONFIG}"
"${EDITOR}" "${_REFIND_LINUX_CONF}" "${EDITOR}" "${_REFIND_LINUX_CONF}"
@ -703,8 +701,7 @@ do_grub_common_before() {
DIALOG --yesno "Setup detected dmraid device.\nDo you want to install grub on this device?" 0 0 && USE_DMRAID="1" DIALOG --yesno "Setup detected dmraid device.\nDo you want to install grub on this device?" 0 0 && USE_DMRAID="1"
fi fi
if [[ ! -d "${DESTDIR}/usr/lib/grub" ]]; then if [[ ! -d "${DESTDIR}/usr/lib/grub" ]]; then
DIALOG --infobox "Couldn't find ${DESTDIR}/usr/lib/grub, installing grub pkg in 3 seconds ..." 0 0 DIALOG --infobox "Installing grub..." 0 0
sleep 3
PACKAGES="grub" PACKAGES="grub"
run_pacman run_pacman
fi fi
@ -1127,7 +1124,7 @@ do_grub_bios() {
return 1 return 1
fi fi
DIALOG --infobox "Installing the grub(2) BIOS bootloader..." 0 0 DIALOG --infobox "Installing grub(2) BIOS bootloader..." 0 0
# freeze and unfreeze xfs filesystems to enable grub(2) installation on xfs filesystems # freeze and unfreeze xfs filesystems to enable grub(2) installation on xfs filesystems
freeze_xfs freeze_xfs
chroot_mount chroot_mount