From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 25 Jan 2022 14:19:26 +0000 (-0300)
Subject: Fix: provision: UEFI: add /boot/efi into fstab
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=4829ffd12c7ce0ba27acd7346200138a58878e87;p=hydra.git

Fix: provision: UEFI: add /boot/efi into fstab
---

diff --git a/share/hydractl/provision b/share/hydractl/provision
index cd3d67a..f2c468c 100755
--- a/share/hydractl/provision
+++ b/share/hydractl/provision
@@ -583,6 +583,12 @@ EOF
   fi
 fi
 
+if [ "$boot_mode" == "uefi" ]; then
+  cat <<-EOF | $SUDO tee -a $WORK/etc/fstab > /dev/null
+${esp_device}         /boot/efi       vfat  defaults,errors=remount-ro         0 2
+EOF
+fi
+
 # LVM.
 if [ "$discards" == "y" ]; then
   $SUDO sed -i -e 's/issue_discards = 0/issue_discards = 1' $WORK/etc/lvm/lvm.conf
@@ -703,7 +709,7 @@ EOF
   if [ "$boot_mode" == "bios" ]; then
     hydra_sudo_run chroot $WORK/ grub-install --recheck --force $device
   else
-    hydra_sudo_run chroot $WORK/ grub-install --target=${grub_arch} --efi-directory=/boot/efi $grub_uefi_nvram
+    hydra_sudo_run chroot $WORK/ grub-install --target=${grub_arch}-efi --efi-directory=/boot/efi $grub_uefi_nvram
   fi
 fi