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

checking on vfat is enough

Browse source
This commit is contained in:
Tobias Powalowski 2024-04-10 09:09:11 +02:00
parent b44afd321d
commit 6d8b3db519
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,10 +18,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" && \
"${_SUBDIR}" == "/boot" && \
$(${_LSBLK} FSTYPE "${_BOOTDEV}" 2>"${_NO_LOG}" | grep -q "vfat") &&
$(${_LSBLK} PARTTYPE "${_BOOTDEV}" 2>"${_NO_LOG}" | grep -q "bc13c2ff-59e6-4262-a352-b275fd6f7172") ]]; then
if [[ "${_UEFISYS_MP}" == "efi" && "${_SUBDIR}" == "/boot" && \
$(${_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
@ -41,10 +39,8 @@ BOOTDEOF
_geteditor || return 1
"${_EDITOR}" "${_DESTDIR}/${_UEFISYS_MP}/loader/entries/archlinux-core-main.conf"
"${_EDITOR}" "${_DESTDIR}/${_UEFISYS_MP}/loader/loader.conf"
if [[ "${_UEFISYS_MP}" == "efi" && \
"${_SUBDIR}" == "/boot" && \
$(${_LSBLK} FSTYPE "${_BOOTDEV}" 2>"${_NO_LOG}" | grep -q "vfat") &&
$(${_LSBLK} PARTTYPE "${_BOOTDEV}" 2>"${_NO_LOG}" | grep -q "bc13c2ff-59e6-4262-a352-b275fd6f7172") ]]; then
if [[ "${_UEFISYS_MP}" == "efi" && "${_SUBDIR}" == "/boot" && \
$(${_LSBLK} FSTYPE "${_BOOTDEV}" 2>"${_NO_LOG}" | grep -q "vfat") ]]; then
_dialog --title " Skipping " --no-mouse --infobox "Skipped kernel, ucode and initramfs copying to EFI SYSTEM PARTITION." 3 75
sleep 3
else