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

Correct the path of swapfile on btrfs

Browse Source
This commit is contained in:
Chrysostomus 2020-12-07 22:47:32 +02:00
parent 80a538665e
commit 97eb32bf5c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -386,7 +386,12 @@ def run():
swap_choice = swap_choice.get( "swap", None ) swap_choice = swap_choice.get( "swap", None )
if swap_choice and swap_choice == "file": if swap_choice and swap_choice == "file":
# There's no formatted partition for it, so we'll sneak in an entry # There's no formatted partition for it, so we'll sneak in an entry
partitions.append( dict(fs="swap", mountPoint=None, claimed=True, device="/swapfile", uuid=None) ) root_partitions = [ p["fs"].lower() for p in partitions if p["mountPoint"] == "/" ]
root_btrfs = (root_partitions[0] == "btrfs") if root_partitions else False
if root_btrfs:
partitions.append( dict(fs="swap", mountPoint=None, claimed=True, device="/swap/swapfile", uuid=None) )
else:
partitions.append( dict(fs="swap", mountPoint=None, claimed=True, device="/swapfile", uuid=None) )
else: else:
swap_choice = None swap_choice = None