Mount subvolumes to correct mountpoints

src/modules/mount/main.py

@@ -108,8 +108,9 @@ def mount_partition(root_mount_point, partition, partitions):
         # Mount the subvolumes
         for s in btrfs_subvolumes:
             mount_option = f"subvol={s['subvolume']}"
+            subvolume_mountpoint = mount_point[:-1] + s['mountPoint']
             if libcalamares.utils.mount(device,
-                                    mount_point,
+                                    subvolume_mountpoint,
                                     fstype,
                                     ",".join([mount_option, partition.get("options", "")])) != 0:
                 libcalamares.utils.warning(f"Cannot mount {device}")