config/vsido-base

@@ -34,3 +34,6 @@ binarydir = ./
 
 [module:network]
 custom_net_ifaces = /etc/linstaller/vsido-net-interfaces
+
+[module:fstab]
+efi_part_mount_opts = x-systemd.automount,x-systemd.device-timeout=2

linstaller/modules/fstab/inst/__init__.py

@@ -82,7 +82,11 @@ proc   /proc   proc   defaults   0   0
 					filesystem = "swap"
 				elif filesystem == "vfat":
 					# FAT partition, needs special opts.
-					opts = "auto,users,rw,quiet,umask=000,shortname=lower"
+					efi_opts = self.moduleclass.settings["efi_part_mount_opts"]
+					if mountpoint in "/boot/efi" and efi_opts:
+						opts = ("auto,users,rw,quiet,umask=000,shortname=lower,%s" % efi_opts)
+					else:
+						opts = "auto,users,rw,quiet,umask=000,shortname=lower"
 				else:
 					# Normal partition.
 					opts = "defaults"
@@ -176,4 +180,4 @@ class Module(module.Module):
 		""" Cache settings. """
 		
 		self.cache("zram",True)
-		
+		self.cache("efi_part_mount_opts",False)