Merge branch 'allow-empty-configs'

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"

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"