From 6d55005da07dcac8baced60c591bb6b5ee32ed2f Mon Sep 17 00:00:00 2001
From: Chrysostomus <matti@manjaro.org>
Date: Sun, 7 Feb 2021 00:16:26 +0200
Subject: [PATCH] Mount subvolumes to correct mountpoints

---
 src/modules/mount/main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
index 50e72b316..27df309a3 100644
--- a/src/modules/mount/main.py
+++ b/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}")