From 6d8b3db519aceeb1071cb080c5d864ec1f218f3b Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Wed, 10 Apr 2024 09:09:11 +0200
Subject: [PATCH] checking on vfat is enough

---
 .../archboot/installer/bootloader_systemd_bootd.sh   | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/usr/lib/archboot/installer/bootloader_systemd_bootd.sh b/usr/lib/archboot/installer/bootloader_systemd_bootd.sh
index 5dab7c43b..3209a53ff 100644
--- a/usr/lib/archboot/installer/bootloader_systemd_bootd.sh
+++ b/usr/lib/archboot/installer/bootloader_systemd_bootd.sh
@@ -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