napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mount subvolumes to correct mountpoints

Browse Source
This commit is contained in:
Chrysostomus 2021-02-07 00:16:26 +02:00
parent b16bd6bb23
commit 6d55005da0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/mount/main.py
View File

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