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

Generate a subvolume for swap if swapfile is used

Browse Source
This commit is contained in:
Chrysostomus 2020-12-07 22:52:39 +02:00
parent 97eb32bf5c
commit b180cbd47d
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,6 +77,7 @@ def mount_partition(root_mount_point, partition, partitions):
# for the root mount point. # for the root mount point.
# If a separate /home partition isn't defined, we also create # If a separate /home partition isn't defined, we also create
# a subvolume "@home". # a subvolume "@home".
# If a swapfile is used, we also create a subvolume "@swap".
# Finally we remount all of the above on the correct paths. # Finally we remount all of the above on the correct paths.
if fstype == "btrfs" and partition["mountPoint"] == '/': if fstype == "btrfs" and partition["mountPoint"] == '/':
has_home_mount_point = False has_home_mount_point = False
@ -94,6 +95,13 @@ def mount_partition(root_mount_point, partition, partitions):
subprocess.check_call(['btrfs', 'subvolume', 'create', subprocess.check_call(['btrfs', 'subvolume', 'create',
root_mount_point + '/@home']) root_mount_point + '/@home'])
swap_choice = global_storage.value( "partitionChoices" )
if swap_choice:
swap_choice = swap_choice.get( "swap", None )
if swap_choice and swap_choice == "file":
subprocess.check_call(['btrfs', 'subvolume', 'create',
root_mount_point + '/@swap'])
subprocess.check_call(["umount", "-v", root_mount_point]) subprocess.check_call(["umount", "-v", root_mount_point])
device = partition["device"] device = partition["device"]