Merge branch 'master' of https://github.com/calamares/calamares into development

CHANGES

@@ -3,7 +3,19 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
-# 3.2.19.1 (unreleased) #
+# 3.2.20 (unreleased) #
+
+This release contains contributions from (alphabetically by first name):
+ - No external contributors yet
+
+## Core ##
+ - No core changes yet
+
+## Modules ##
+ - No module changes yet
+
+
+# 3.2.19.1 (2020-02-24) #
 
 This is a hotfix release for bugs in the *users* module.
 Reported by Philip Mueller and Walter Lapchynski.
@@ -11,6 +23,11 @@ Reported by Philip Mueller and Walter Lapchynski.
 ## Modules ##
  - The *users* module no longer wrote `/etc/hostname` at all.
  - The *users* module erroneously shows the root password input fields.
+ - The *initramfs* module sets a resume-hook even when there is no swap.
+ - The partitioning service expects *udevadm* in `/sbin`, but some
+   distro's place it elsewhere.
+ - The mount service didn't unmount directories properly, leading to
+   blocked installations.
 
 
 # 3.2.19 (2020-02-21) #

CMakeLists.txt

@@ -40,10 +40,10 @@
 
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.19.1
+    VERSION 3.2.20
     LANGUAGES C CXX )
 
-set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
+set( CALAMARES_VERSION_RC 1 )  # Set to 0 during release cycle, 1 during development
 
 ### OPTIONS
 #

src/libcalamares/partition/Mount.cpp

@@ -117,7 +117,7 @@ TemporaryMount::~TemporaryMount()
 {
     if ( m_d )
     {
-        int r = unmount( m_d->m_devicePath, { "-R" } );
+        int r = unmount( m_d->m_mountDir.path(), { "-R" } );
         if ( r )
         {
             cWarning() << "UnMount of temporary" << m_d->m_devicePath << "on" << m_d->m_mountDir.path()