diff --git a/CHANGES b/CHANGES index d91de15b2..90587d46b 100644 --- a/CHANGES +++ b/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) # diff --git a/CMakeLists.txt b/CMakeLists.txt index db8fab382..479009faf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ project( CALAMARES VERSION 3.2.19 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 # diff --git a/src/branding/manjaro/branding.desc b/src/branding/manjaro/branding.desc index 52095c5ba..58d6ee752 100644 --- a/src/branding/manjaro/branding.desc +++ b/src/branding/manjaro/branding.desc @@ -49,10 +49,10 @@ windowPlacement: center strings: productName: Manjaro Linux shortProductName: Manjaro - version: 18.0 - shortVersion: 18.0 - versionedName: Manjaro Linux 18.0 "Illyria" - shortVersionedName: Manjaro 18.0 + version: 19.0 + shortVersion: 19.0 + versionedName: Manjaro Linux 19.0 "Kyria" + shortVersionedName: Manjaro 19.0 bootloaderEntryName: Manjaro # These images are loaded from the branding module directory. diff --git a/src/libcalamares/partition/Mount.cpp b/src/libcalamares/partition/Mount.cpp index aa30c9d92..2bb49b0cb 100644 --- a/src/libcalamares/partition/Mount.cpp +++ b/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() diff --git a/src/modules/fstab/fstab.conf b/src/modules/fstab/fstab.conf index b2f3de361..7724fd841 100644 --- a/src/modules/fstab/fstab.conf +++ b/src/modules/fstab/fstab.conf @@ -10,7 +10,7 @@ # options from this mapping. mountOptions: default: defaults,noatime - btrfs: defaults,noatime,space_cache,autodefrag + btrfs: defaults,noatime,space_cache # Mount options to use for the EFI System Partition. If not defined, the # *mountOptions* for *vfat* are used, or if that is not set either, @@ -25,7 +25,7 @@ ssdExtraMountOptions: jfs: discard xfs: discard swap: discard - btrfs: discard,compress=lzo + btrfs: ssd,compress=zstd,commit=120 # Additional options added to each line in /etc/crypttab crypttabOptions: luks