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

[fstab, mount] Warn when the mount options end up weird

Browse Source
This commit is contained in:
Adriaan de Groot 2022-06-11 00:30:32 +02:00
parent 57d978b82d
commit 2f3fb4a387
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -407,6 +407,7 @@ def run():
# We rely on mount_options having a default; if there wasn't one, # We rely on mount_options having a default; if there wasn't one,
# bail out with a meaningful error. # bail out with a meaningful error.
if not mount_options_list: if not mount_options_list:
libcalamares.utils.warning("No mount options defined, {!s} partitions".format(len(partitions)))
return (_("Configuration Error"), return (_("Configuration Error"),
_("No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use.") _("No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use.")
.format("mountOptions", "fstab")) .format("mountOptions", "fstab"))

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

@ -351,6 +351,9 @@ def run():
except ZfsException as ze: except ZfsException as ze:
return _("zfs mounting error"), ze.message return _("zfs mounting error"), ze.message
if not mount_options_list:
libcalamares.utils.warning("No mount options defined, {!s} partitions, {!s} mountable".format(len(partitions), len(mountable_partitions)))
libcalamares.globalstorage.insert("rootMountPoint", root_mount_point) libcalamares.globalstorage.insert("rootMountPoint", root_mount_point)
libcalamares.globalstorage.insert("mountOptionsList", mount_options_list) libcalamares.globalstorage.insert("mountOptionsList", mount_options_list)