From 2f3fb4a3874d2929a0056aedee59beb43481d83e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 11 Jun 2022 00:30:32 +0200 Subject: [PATCH] [fstab, mount] Warn when the mount options end up weird --- src/modules/fstab/main.py | 1 + src/modules/mount/main.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py index f66fc2fa4..97e7e7486 100755 --- a/src/modules/fstab/main.py +++ b/src/modules/fstab/main.py @@ -407,6 +407,7 @@ def run(): # We rely on mount_options having a default; if there wasn't one, # bail out with a meaningful error. if not mount_options_list: + libcalamares.utils.warning("No mount options defined, {!s} partitions".format(len(partitions))) return (_("Configuration Error"), _("No
{!s}
configuration is given for
{!s}
to use.") .format("mountOptions", "fstab")) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index d8041f9ce..49ffc9627 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -351,6 +351,9 @@ def run(): except ZfsException as ze: 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("mountOptionsList", mount_options_list)