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

next try to fix systemd-boot

Browse source
This commit is contained in:
Tobias Powalowski 2024-04-13 16:09:19 +02:00
parent 559d47eb47
commit 34b961ea97
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
usr/lib/archboot/installer/bootloader_systemd_bootd.sh
View file

@ -4,9 +4,9 @@
_systemd_boot_uefi() {
_dialog --no-mouse --infobox "Setting up SYSTEMD-BOOT now..." 3 40
# create directory structure, if it doesn't exist
[[ -d "${_DESTDIR}/${_UEFISYS_MP}/loader/entries" ]] || mkdir -p "${_DESTDIR}/${_UEFISYS_MP}/loader/entries"
_MAIN_CFG="${_UEFISYS_MP}/loader/entries/archlinux-core-main.conf"
_LOADER_CFG="${_UEFISYS_MP}/loader/loader.conf"
[[ -d "${_DESTDIR}/boot/loader/entries" ]] || mkdir -p "${_DESTDIR}/boot/loader/entries"
_MAIN_CFG="boot/loader/entries/archlinux-core-main.conf"
_LOADER_CFG="boot/loader/loader.conf"
cat << BOOTDEOF > "${_DESTDIR}/${_MAIN_CFG}"
title Arch Linux
linux /${_VMLINUZ}
@ -20,13 +20,8 @@ BOOTDEOF
_chroot_mount
# systemd-boot https://www.freedesktop.org/software/systemd/man/latest/systemd-gpt-auto-generator.html
# /boot XBOOTLDR in vfat format can be booted by systemd-boot
if [[ "${_UEFISYS_MP}" == "efi" ]] && ${_LSBLK} FSTYPE "${_BOOTDEV}" 2>"${_NO_LOG}" | grep -q "vfat"; then
chroot "${_DESTDIR}" bootctl --esp-path=/efi --boot-path=/boot install &>"${_LOG}"
chroot "${_DESTDIR}" bootctl --esp-path=/efi --boot-path=/boot update &>"${_LOG}"
else
chroot "${_DESTDIR}" bootctl --path="/${_UEFISYS_MP}" install &>"${_LOG}"
chroot "${_DESTDIR}" bootctl --path="/${_UEFISYS_MP}" update &>"${_LOG}"
fi
chroot "${_DESTDIR}" bootctl --esp-path=/${_UEFISYS_MP} --boot-path=/boot install &>"${_LOG}"
chroot "${_DESTDIR}" bootctl --esp-path=/${_UEFISYS_MP} --boot-path=/boot update &>"${_LOG}"
_chroot_umount
if [[ -e "${_DESTDIR}/${_UEFISYS_MP}/EFI/systemd/systemd-boot${_SPEC_UEFI_ARCH}.efi" ]]; then
rm -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"