During installation, if a swap partition exists, enable swap. #2097
Conversation
|
I will put comments on this in a few minutes. However, please stop closing the PRs and creating new ones. You can continue to push changes to your PR. You don't need to create new ones each time you make changes. |
|
In particular, you can amend your commit and force-push to your branch, and the pull request will automatically pick up the amended commit. |
|
I understand. Could you please teach me how to make changes, as I don't know how to do it? |
src/modules/mount/main.py
Outdated
| @@ -321,6 +327,12 @@ def run(): | |||
| return (_("Configuration Error"), | |||
| _("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'] | |||
There was a problem hiding this comment.
You need to ensure the swap partition is "claimed". We shouldn't enable an unclaimed partition.
There was a problem hiding this comment.
Why do you ask?
It seems that in some cases the swap partition may not be recognized even though I manually configure the partition and expect it to be recognized as claimed false.
There was a problem hiding this comment.
The "claimed" flag should be set if we are using it with Calamares.
We can't use other swap partitions because we don't know what is in them. For example, it might hold resume data for another distro.
src/modules/mount/main.py
Outdated
| @@ -307,6 +307,12 @@ 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_device): | |||
There was a problem hiding this comment.
You probably need to handle the condition where the swap partition is encrypted.
Whenever you update your branch, the PR is automatically updated. |
phoepsilonix
force-pushed
the
calamares
branch
from
b00a302
to
8a2349e
Compare
src/modules/mount/main.py
Outdated
| @@ -321,6 +327,11 @@ def run(): | |||
| return (_("Configuration Error"), | |||
| _("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 ] | |||
There was a problem hiding this comment.
Shouldn't claimed be True here?
There was a problem hiding this comment.
"As far as I can see from checking the log output, I believe False is the correct answer."
There was a problem hiding this comment.
It seems that in case of manual configuration it is False, in case of automatic configuration it will beTrue as well.
phoepsilonix
force-pushed
the
calamares
branch
3 times, most recently
from
3d4c1ab
to
6a01e2f
Compare
phoepsilonix
force-pushed
the
calamares
branch
2 times, most recently
from
0429305
to
77e1407
Compare
phoepsilonix
force-pushed
the
calamares
branch
from
77e1407
to
a5ae67f
Compare
If there is no swap at all when the partition of the installation destination device is mounted, if a Swap partition exists, enable swap.