From 7e87e3ccb52b06b757e455ac3e0686582b44f87a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 2 Jun 2017 15:43:07 +0200
Subject: [PATCH 1/2] Configs: fix trivial spelling error

---
 src/modules/umount/umount.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/umount/umount.conf b/src/modules/umount/umount.conf
index 98c04fff2..907b8d890 100644
--- a/src/modules/umount/umount.conf
+++ b/src/modules/umount/umount.conf
@@ -1,5 +1,5 @@
 ---
-#scrLog:       "/path/to/installation.log"
+#srcLog:       "/path/to/installation.log"
 #destLog:      "/var/log/installation.log"
 # example when using the Calamares created log:
 #srcLog:      "/root/.cache/Calamares/Calamares/Calamares.log"

From 367fe716b3664a8913fc787a3ca33ff7c1ee7e69 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 2 Jun 2017 16:10:08 +0200
Subject: [PATCH 2/2] Configs: empty config files are ok.

The default umount.conf contains no keys -- so it isn't a map,
but it is a valid config file. Avoid the warning by accepting
empty files.

FIX 707
---
 src/libcalamaresui/modulesystem/Module.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/libcalamaresui/modulesystem/Module.cpp b/src/libcalamaresui/modulesystem/Module.cpp
index 5395ff7f2..1b3da87e8 100644
--- a/src/libcalamaresui/modulesystem/Module.cpp
+++ b/src/libcalamaresui/modulesystem/Module.cpp
@@ -176,6 +176,12 @@ Module::loadConfigurationFile( const QString& configFileName ) //throws YAML::Ex
             QByteArray ba = configFile.readAll();
 
             YAML::Node doc = YAML::Load( ba.constData() );
+            if ( doc.IsNull() )
+            {
+                // Special case: empty config files are valid,
+                // but aren't a map.
+                return;
+            }
             if ( !doc.IsMap() )
             {
                 cLog() << Q_FUNC_INFO << "bad module configuration format"