From cf7c0900b6f81ca3c206bcfbc8f7b3e9b3b69448 Mon Sep 17 00:00:00 2001 From: Matti Hyttinen Date: Sun, 23 Feb 2020 09:50:56 +0100 Subject: [PATCH 1/5] Optimize fstab for btrfs performance and stability --- src/modules/fstab/fstab.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 1cc9f61ba76ab5bc60f28d63f73a92cd368db1cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Mon, 24 Feb 2020 20:21:41 +0100 Subject: [PATCH 2/5] [branding] bump to Kyria --- src/branding/manjaro/branding.desc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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. From 2db3b413f47c5420f0d86e3a08d0e7ccb40b825f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 24 Feb 2020 20:58:02 +0100 Subject: [PATCH 3/5] [libcalamares] Unmount with mount point, not device - The manpage for umount says that -R can only be used with a mount point (e.g. /usr/local) and not a device name; this makes sense because a device might be mounted in multiple locations, but the mountpoint (and things mounted under it) lives in the filesystem tree. - Existing code tried to unmount -R the device, not the mount point, and so always failed; leaving things mounted that shouldn't. --- src/libcalamares/partition/Mount.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() From 9b4af86ab937d6577d648f45f65c60c9de8647ef Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 24 Feb 2020 21:44:30 +0100 Subject: [PATCH 4/5] Changes: fix up the changelog that should have been in 3.2.19.1 --- CHANGES | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index d91de15b2..c5451f4fe 100644 --- a/CHANGES +++ b/CHANGES @@ -3,7 +3,7 @@ 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.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 +11,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) # From aacdb6be29f4140322032841f4ca2a657462d149 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 24 Feb 2020 21:47:13 +0100 Subject: [PATCH 5/5] Changes: post-release housekeeping --- CHANGES | 12 ++++++++++++ CMakeLists.txt | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index c5451f4fe..90587d46b 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,18 @@ 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.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. diff --git a/CMakeLists.txt b/CMakeLists.txt index b2dd344ad..6eb705812 100644 --- a/CMakeLists.txt +++ b/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 #