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

[mount] Improve error handling for zfs

Browse Source
This commit is contained in:
dalto 2021-11-07 08:01:32 -06:00
parent 858e271c8a
commit 85a2160098
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,18 +136,22 @@ def mount_partition(root_mount_point, partition, partitions):
zfs = libcalamares.globalstorage.value("zfs") zfs = libcalamares.globalstorage.value("zfs")
if not zfs: if not zfs:
libcalamares.utils.warning("Failed to locate zfs dataset list") libcalamares.utils.error("Failed to locate zfs dataset list")
# Set the canmount property for each dataset. This will effectively mount the dataset # Set the canmount property for each dataset. This will effectively mount the dataset
for dataset in zfs: for dataset in zfs:
if dataset['canmount'] == 'noauto' or dataset['canmount'] == 'on': try:
subprocess.check_call(['zfs', 'set', 'canmount=' + dataset['canmount'], if dataset['canmount'] == 'noauto' or dataset['canmount'] == 'on':
dataset['zpool'] + '/' + dataset['dsName']]) subprocess.check_call(['zfs', 'set', 'canmount=' + dataset['canmount'],
dataset['zpool'] + '/' + dataset['dsName']])
# It is common for the / mountpoint to be set to noauto since it is mounted by the initrd # It is common for the / mountpoint to be set to noauto since it is mounted by the initrd
# If this is the case we need to manually mount it here # If this is the case we need to manually mount it here
if dataset['mountpoint'] == '/' and dataset['canmount'] == 'noauto': if dataset['mountpoint'] == '/' and dataset['canmount'] == 'noauto':
subprocess.check_call(['zfs', 'mount', dataset['zpool'] + '/' + dataset['dsName']]) subprocess.check_call(['zfs', 'mount', dataset['zpool'] + '/' + dataset['dsName']])
except KeyError:
# This should be impossible
libcalamares.utils.error("Internal error handling zfs dataset")
def run(): def run():