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

[mount] Bail on bad config

Browse Source 
- One might argue whether an empty list of partitions to mount is
   a bad thing. It suggests that the partition module wasn't used,
   and so we're in an OEM situation -- but then everything should
   already be mounted anyway. That's why I choose empty -> bail.
This commit is contained in:
Adriaan de Groot 2019-04-28 14:32:27 -04:00
parent ec0fe2ccd3
commit 7d0874e23b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,9 +133,15 @@ def run():
:return: :return:
""" """
root_mount_point = tempfile.mkdtemp(prefix="calamares-root-")
partitions = libcalamares.globalstorage.value("partitions") partitions = libcalamares.globalstorage.value("partitions")
if not partitions:
libcalamares.utils.warning("partitions is empty, {!s}".format(partitions))
return (_("Configuration Error"),
_("No partitions are defined for <pre>{!s}</pre> to use." ).format("mount"))
root_mount_point = tempfile.mkdtemp(prefix="calamares-root-")
# Guard against missing keys (generally a sign that the config file is bad) # Guard against missing keys (generally a sign that the config file is bad)
extra_mounts = libcalamares.job.configuration.get("extraMounts") or [] extra_mounts = libcalamares.job.configuration.get("extraMounts") or []
extra_mounts_efi = libcalamares.job.configuration.get("extraMountsEfi") or [] extra_mounts_efi = libcalamares.job.configuration.get("extraMountsEfi") or []