Mount all efi filesystems

src/idmslinux_installer/plugins/mount_filesystems.py

@@ -64,16 +64,19 @@ class MountFilesystems(Plugin):
 
         # If we have a efi filesystem, use it
         if 'efi' in ili_state.filesystems:
-            ili_state.output_callback('Mounting EFI filesystem')
-            # Determine the boot mount point
-            mount_point = '%s%s' % (ili_state.target_mount, self._efi_dir)
-            # Determine the efi path
-            filesystem = ili_state.filesystems['efi']
-            # Mount the efi filesystem
-            mount = Mount(uuid=filesystem['uuid'], fstype=filesystem['fstype'], mount_point=mount_point)
-            ili_state.add_mount(mount)
-            # Add fstab entry
-            ili_state.add_fstab('efi', mount.mount_device, self._efi_dir, filesystem['fstype'], fspass=2)
+            ili_state.output_callback('Mounting EFI filesystems')
+            efi_no = 1
+            for filesystem in ili_state.filesystems['efi']:
+                # Determine the boot mount point
+                mount_point = f'{self._efi_dir}/{efi_no}'
+                mount_point_host = f'{ili_state.target_mount}{mount_point}'
+                # Mount the efi filesystem
+                mount = Mount(uuid=filesystem['uuid'], fstype=filesystem['fstype'], mount_point=mount_point_host)
+                ili_state.add_mount(mount)
+                # Add fstab entry
+                ili_state.add_fstab('efi', mount.mount_device, mount_point, filesystem['fstype'], fspass=2)
+                # Bump EFI number
+                efi_no += 1
 
         # Set the target root
         ili_state.target_root = ili_state.target_mount