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

During installation, if a swap partition exists, enable swap.

Browse Source 
If there is no swap at all when the partition of the installation destination device is mounted,
    if a Swap partition exists, enable swap.
This commit is contained in:
Masato Toyoshima 2023-02-14 04:30:24 +09:00
parent 79d796a437
commit 77e1407c51
No known key found for this signature in database
GPG Key ID: 536487F1470D7187
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,7 +307,7 @@ def mount_partition(root_mount_point, partition, partitions, mount_options, moun
mount_option) != 0:
libcalamares.utils.warning("Cannot mount {}".format(device))
def enable_swap_partition(swap_partitions):
def enable_swap_partitions(swap_partitions):
try:
for swap_device in swap_partitions:
libcalamares.utils.host_env_process_output(["swapon", swap_device])
@ -328,9 +328,8 @@ def run():
_("No partitions are defined for <pre>{!s}</pre> to use.").format("mount"))
# swap
swap_partitions = [p['device'] for p in partitions if p['fs'] == 'linuxswap' and p['claimed'] == False ]
if ( swap_partitions != [] ):
enable_swap_partition(swap_partitions)
swap_partitions = [p['device'] for p in partitions if p['fs'] == 'linuxswap' ]
enable_swap_partitions(swap_partitions)
root_mount_point = tempfile.mkdtemp(prefix="calamares-root-")