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

Update main.py

Browse Source
This commit is contained in:
Masato TOYOSHIMA 2023-02-26 07:24:12 +09:00 committed by GitHub
parent 0038751106
commit 5513ffcd1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,15 +307,6 @@ def mount_partition(root_mount_point, partition, partitions, mount_options, moun
mount_option) != 0: mount_option) != 0:
libcalamares.utils.warning("Cannot mount {}".format(device)) libcalamares.utils.warning("Cannot mount {}".format(device))
<<<<<<< ours
def enable_swap_partitions(swap_partitions):
try:
for swap_device in swap_partitions:
libcalamares.utils.host_env_process_output(["swapon", swap_device])
except subprocess.CalledProcessError:
libcalamares.utils.warning("Failed to swapon " + swap_device)
||||||| base
=======
def enable_swap_partition(swap_device): def enable_swap_partition(swap_device):
try: try:
for d in swap_device: for d in swap_device:
@ -323,8 +314,6 @@ def enable_swap_partition(swap_device):
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
raise Exception(_("Failed to swapon " + swap_device)) raise Exception(_("Failed to swapon " + swap_device))
>>>>>>> theirs
def run(): def run():
""" """
Mount all the partitions from GlobalStorage and from the job configuration. Mount all the partitions from GlobalStorage and from the job configuration.
@ -338,19 +327,10 @@ def run():
return (_("Configuration Error"), return (_("Configuration Error"),
_("No partitions are defined for <pre>{!s}</pre> to use.").format("mount")) _("No partitions are defined for <pre>{!s}</pre> to use.").format("mount"))
<<<<<<< ours
# swap
swap_partitions = [p['device'] for p in partitions if ( p['fs'] == 'linuxswap' and p.get("claimed", None) )]
if ( swap_partitions != [] ):
enable_swap_partition(swap_partitions)
||||||| base
=======
swap_partitions = [p['device'] for p in partitions if ( p['fs'] == 'linuxswap' and p['claimed'] == True ) ] swap_partitions = [p['device'] for p in partitions if ( p['fs'] == 'linuxswap' and p['claimed'] == True ) ]
if swap_partitions != [] : if swap_partitions != [] :
enable_swap_partition(swap_partitions) enable_swap_partition(swap_partitions)
>>>>>>> theirs
root_mount_point = tempfile.mkdtemp(prefix="calamares-root-") root_mount_point = tempfile.mkdtemp(prefix="calamares-root-")
# Get the mountOptions, if this is None, that is OK and will be handled later # Get the mountOptions, if this is None, that is OK and will be handled later