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

[mount] Ensure efi partition gets correct options

Browse Source
This commit is contained in:
dalto 2024-03-17 19:03:02 -05:00 committed by Philip Mueller
parent 0f9c5f9686
commit a12edb1065
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,13 +74,14 @@ def is_ssd_disk(partition):
return False return False
def get_mount_options(filesystem, mount_options, partition): def get_mount_options(filesystem, mount_options, partition, efi_location = None):
""" """
Returns the mount options for the partition object and filesystem Returns the mount options for the partition object and filesystem
:param filesystem: A string containing the filesystem :param filesystem: A string containing the filesystem
:param mount_options: A list of dicts that descripes the mount options for each mountpoint :param mount_options: A list of dicts that descripes the mount options for each mountpoint
:param partition: A dict containing information about the partition :param partition: A dict containing information about the partition
:param efi_location: A string holding the location of the EFI partition or None
:return: A comma seperated string containing the mount options suitable for passing to mount :return: A comma seperated string containing the mount options suitable for passing to mount
""" """
@ -92,7 +93,13 @@ def get_mount_options(filesystem, mount_options, partition):
if mount_options is None: if mount_options is None:
return "defaults" return "defaults"
options = next((x for x in mount_options if x["filesystem"] == filesystem), None) # The EFI partition uses special mounting options
if efi_location and partition["mountPoint"] == efi_location:
effective_filesystem = "efi"
else:
effective_filesystem = filesystem
options = next((x for x in mount_options if x["filesystem"] == effective_filesystem), None)
# If there is no match then check for default options # If there is no match then check for default options
if options is None: if options is None:
@ -214,7 +221,7 @@ def mount_zfs(root_mount_point, partition):
raise ZfsException(_("Failed to set zfs mountpoint")) raise ZfsException(_("Failed to set zfs mountpoint"))
def mount_partition(root_mount_point, partition, partitions, mount_options, mount_options_list): def mount_partition(root_mount_point, partition, partitions, mount_options, mount_options_list, efi_location):
""" """
Do a single mount of @p partition inside @p root_mount_point. Do a single mount of @p partition inside @p root_mount_point.
@ -223,6 +230,7 @@ def mount_partition(root_mount_point, partition, partitions, mount_options, moun
:param partitions: The full list of partitions used to filter out btrfs subvols which have duplicate mountpoints :param partitions: The full list of partitions used to filter out btrfs subvols which have duplicate mountpoints
:param mount_options: The mount options from the config file :param mount_options: The mount options from the config file
:param mount_options_list: A list of options for each mountpoint to be placed in global storage for future modules :param mount_options_list: A list of options for each mountpoint to be placed in global storage for future modules
:param efi_location: A string holding the location of the EFI partition or None
:return: :return:
""" """
# Create mount point with `+` rather than `os.path.join()` because # Create mount point with `+` rather than `os.path.join()` because
@ -235,7 +243,9 @@ def mount_partition(root_mount_point, partition, partitions, mount_options, moun
# Ensure that the created directory has the correct SELinux context on # Ensure that the created directory has the correct SELinux context on
# SELinux-enabled systems. # SELinux-enabled systems.
os.makedirs(mount_point, exist_ok=True) os.makedirs(mount_point, exist_ok=True)
try: try:
subprocess.call(['chcon', '--reference=' + raw_mount_point, mount_point]) subprocess.call(['chcon', '--reference=' + raw_mount_point, mount_point])
except FileNotFoundError as e: except FileNotFoundError as e:
@ -259,7 +269,7 @@ def mount_partition(root_mount_point, partition, partitions, mount_options, moun
if fstype == "zfs": if fstype == "zfs":
mount_zfs(root_mount_point, partition) mount_zfs(root_mount_point, partition)
else: # fstype == "zfs" else: # fstype == "zfs"
mount_options_string = get_mount_options(fstype, mount_options, partition) mount_options_string = get_mount_options(fstype, mount_options, partition, efi_location)
if libcalamares.utils.mount(device, if libcalamares.utils.mount(device,
mount_point, mount_point,
fstype, fstype,
@ -349,7 +359,10 @@ def run():
if not extra_mounts: if not extra_mounts:
libcalamares.utils.warning("No extra mounts defined. Does mount.conf exist?") libcalamares.utils.warning("No extra mounts defined. Does mount.conf exist?")
if libcalamares.globalstorage.value("firmwareType") != "efi": efi_location = None
if libcalamares.globalstorage.value("firmwareType") == "efi":
efi_location = libcalamares.globalstorage.value("efiSystemPartition")
else:
for mount in extra_mounts: for mount in extra_mounts:
if mount.get("efi", None) is True: if mount.get("efi", None) is True:
extra_mounts.remove(mount) extra_mounts.remove(mount)
@ -365,7 +378,7 @@ def run():
mount_options_list = [] mount_options_list = []
try: try:
for partition in mountable_partitions: for partition in mountable_partitions:
mount_partition(root_mount_point, partition, partitions, mount_options, mount_options_list) mount_partition(root_mount_point, partition, partitions, mount_options, mount_options_list, efi_location)
except ZfsException as ze: except ZfsException as ze:
return _("zfs mounting error"), ze.message return _("zfs mounting error"), ze.message