From 261ab35b9cc282e2a5a6860e5ec9d1b7e4afdfa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Wed, 22 Apr 2020 18:07:41 +0200 Subject: [PATCH 01/22] [displaymanager] update autologin for OEM setup --- src/modules/displaymanager/main.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index c00ae1dac..ed00bb635 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -3,7 +3,7 @@ # # === This file is part of Calamares - === # -# Copyright 2014-2018, Philip Müller +# Copyright 2014-2018 & 2020, Philip Müller # Copyright 2014-2015, Teo Mrnjavac # Copyright 2014, Kevin Kofler # Copyright 2017, Alf Gaida @@ -299,6 +299,8 @@ class DMmdm(DisplayManager): "[daemon]\n" "AutomaticLoginEnable=False\n" ) + if 'AutomaticLogin=' in line: + line = "AutomaticLogin={!s}\n".format(username) mdm_conf.write(line) else: @@ -405,6 +407,8 @@ class DMgdm(DisplayManager): ) else: line = "[daemon]\nAutomaticLoginEnable=False\n" + if 'AutomaticLogin=' in line: + line = "AutomaticLogin={!s}\n".format(username) gdm_conf.write(line) else: From 7778518afde318a2cf9c03f58e98b49514271b6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Wed, 22 Apr 2020 19:01:58 +0200 Subject: [PATCH 02/22] [displaymanager] update OEM autologin --- src/modules/displaymanager/main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index ed00bb635..40189bfc7 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -287,7 +287,9 @@ class DMmdm(DisplayManager): with open(mdm_conf_path, 'w') as mdm_conf: for line in text: - if '[daemon]' in line: + if 'AutomaticLogin=' in line: + line = "AutomaticLogin={!s}\n".format(username) + else '[daemon]' in line: if do_autologin: line = ( "[daemon]\n" @@ -299,8 +301,6 @@ class DMmdm(DisplayManager): "[daemon]\n" "AutomaticLoginEnable=False\n" ) - if 'AutomaticLogin=' in line: - line = "AutomaticLogin={!s}\n".format(username) mdm_conf.write(line) else: @@ -398,7 +398,9 @@ class DMgdm(DisplayManager): with open(gdm_conf_path, 'w') as gdm_conf: for line in text: - if '[daemon]' in line: + if 'AutomaticLogin=' in line: + line = "AutomaticLogin={!s}\n".format(username) + else '[daemon]' in line: if do_autologin: line = ( "[daemon]\n" @@ -407,8 +409,6 @@ class DMgdm(DisplayManager): ) else: line = "[daemon]\nAutomaticLoginEnable=False\n" - if 'AutomaticLogin=' in line: - line = "AutomaticLogin={!s}\n".format(username) gdm_conf.write(line) else: From 4d654b71e3826dd4ee234e051d16c12d507151f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Wed, 22 Apr 2020 19:24:10 +0200 Subject: [PATCH 03/22] [displaymanager] update OEM autologin --- src/modules/displaymanager/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 40189bfc7..a737ece60 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -289,7 +289,7 @@ class DMmdm(DisplayManager): for line in text: if 'AutomaticLogin=' in line: line = "AutomaticLogin={!s}\n".format(username) - else '[daemon]' in line: + elif '[daemon]' in line: if do_autologin: line = ( "[daemon]\n" @@ -400,7 +400,7 @@ class DMgdm(DisplayManager): for line in text: if 'AutomaticLogin=' in line: line = "AutomaticLogin={!s}\n".format(username) - else '[daemon]' in line: + elif '[daemon]' in line: if do_autologin: line = ( "[daemon]\n" From 0dd93810ac1393174751504153873dce64be373b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Wed, 22 Apr 2020 19:34:29 +0200 Subject: [PATCH 04/22] [displaymanager] update OEM autologin --- src/modules/displaymanager/main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index a737ece60..0f8b6a302 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -287,10 +287,10 @@ class DMmdm(DisplayManager): with open(mdm_conf_path, 'w') as mdm_conf: for line in text: - if 'AutomaticLogin=' in line: + if 'AutomaticLogin=' in line and do_autologin:: line = "AutomaticLogin={!s}\n".format(username) - elif '[daemon]' in line: - if do_autologin: + else: + if '[daemon]' in line and do_autologin: line = ( "[daemon]\n" "AutomaticLogin={!s}\n" @@ -398,10 +398,10 @@ class DMgdm(DisplayManager): with open(gdm_conf_path, 'w') as gdm_conf: for line in text: - if 'AutomaticLogin=' in line: + if 'AutomaticLogin=' in line and do_autologin:: line = "AutomaticLogin={!s}\n".format(username) - elif '[daemon]' in line: - if do_autologin: + else: + if '[daemon]' in line and do_autologin: line = ( "[daemon]\n" "AutomaticLogin={!s}\n" From 96251ed1c3d27fe424fae595b2df8a3d159cca78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Wed, 22 Apr 2020 19:48:23 +0200 Subject: [PATCH 05/22] Revert "[displaymanager] update OEM autologin" This reverts commit 0dd93810ac1393174751504153873dce64be373b. --- src/modules/displaymanager/main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 0f8b6a302..a737ece60 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -287,10 +287,10 @@ class DMmdm(DisplayManager): with open(mdm_conf_path, 'w') as mdm_conf: for line in text: - if 'AutomaticLogin=' in line and do_autologin:: + if 'AutomaticLogin=' in line: line = "AutomaticLogin={!s}\n".format(username) - else: - if '[daemon]' in line and do_autologin: + elif '[daemon]' in line: + if do_autologin: line = ( "[daemon]\n" "AutomaticLogin={!s}\n" @@ -398,10 +398,10 @@ class DMgdm(DisplayManager): with open(gdm_conf_path, 'w') as gdm_conf: for line in text: - if 'AutomaticLogin=' in line and do_autologin:: + if 'AutomaticLogin=' in line: line = "AutomaticLogin={!s}\n".format(username) - else: - if '[daemon]' in line and do_autologin: + elif '[daemon]' in line: + if do_autologin: line = ( "[daemon]\n" "AutomaticLogin={!s}\n" From b64e8c831dd31738e57bc871383b64f77e9eb990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Wed, 22 Apr 2020 20:22:16 +0200 Subject: [PATCH 06/22] [displaymanager] update OEM autologin --- src/modules/displaymanager/main.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index a737ece60..1529aab17 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -3,7 +3,7 @@ # # === This file is part of Calamares - === # -# Copyright 2014-2018 & 2020, Philip Müller +# Copyright 2014-2018, Philip Müller # Copyright 2014-2015, Teo Mrnjavac # Copyright 2014, Kevin Kofler # Copyright 2017, Alf Gaida @@ -288,8 +288,10 @@ class DMmdm(DisplayManager): with open(mdm_conf_path, 'w') as mdm_conf: for line in text: if 'AutomaticLogin=' in line: - line = "AutomaticLogin={!s}\n".format(username) - elif '[daemon]' in line: + line = "" + if 'AutomaticLoginEnable=True' in line: + line = "" + if '[daemon]' in line: if do_autologin: line = ( "[daemon]\n" @@ -399,8 +401,10 @@ class DMgdm(DisplayManager): with open(gdm_conf_path, 'w') as gdm_conf: for line in text: if 'AutomaticLogin=' in line: - line = "AutomaticLogin={!s}\n".format(username) - elif '[daemon]' in line: + line = "" + if 'AutomaticLoginEnable=True' in line: + line = "" + if '[daemon]' in line: if do_autologin: line = ( "[daemon]\n" From 160f8c2aea87ab4ff318b1729a171620f8379441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Thu, 7 May 2020 13:17:06 +0200 Subject: [PATCH 07/22] [fstab] discard 'discard' option - we rather use 'fstrim' via systemd timmer - see: https://github.com/calamares/calamares/issues/1395 --- src/modules/fstab/fstab.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/modules/fstab/fstab.conf b/src/modules/fstab/fstab.conf index 7724fd841..576e505b6 100644 --- a/src/modules/fstab/fstab.conf +++ b/src/modules/fstab/fstab.conf @@ -21,10 +21,6 @@ efiMountOptions: umask=0077 # filesystem is listed here, use those options, otherwise no additional # options are set (i.e. there is no *default* like in *mountOptions*). ssdExtraMountOptions: - ext4: discard - jfs: discard - xfs: discard - swap: discard btrfs: ssd,compress=zstd,commit=120 # Additional options added to each line in /etc/crypttab From 3081be948a77653889c6041803830a712fba94e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sun, 10 May 2020 14:05:02 +0200 Subject: [PATCH 08/22] [branding] 20.0 --- 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 58d6ee752..061019b86 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: 19.0 - shortVersion: 19.0 - versionedName: Manjaro Linux 19.0 "Kyria" - shortVersionedName: Manjaro 19.0 + version: 20.0 + shortVersion: 20.0 + versionedName: Manjaro Linux 20.0 "Lysia" + shortVersionedName: Manjaro 20.0 bootloaderEntryName: Manjaro # These images are loaded from the branding module directory. From 717ccf9193a2dfffed7bde096e1adaaf4b69178b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Tue, 19 May 2020 16:43:06 +0200 Subject: [PATCH 09/22] [postcfg] also remove calamares-git if present --- src/modules/postcfg/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/postcfg/main.py b/src/modules/postcfg/main.py index 9fec42289..78dccb8f2 100644 --- a/src/modules/postcfg/main.py +++ b/src/modules/postcfg/main.py @@ -98,6 +98,7 @@ class ConfigController: # Remove calamares self.remove_pkg("calamares", "usr/bin/calamares") + self.remove_pkg("calamares-git", "usr/bin/calamares") # Copy skel to root self.copy_folder('etc/skel', 'root') From b8c3d15994ab38c70f9c12f0c0cf52ac295b2ecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Fri, 29 May 2020 18:28:31 +0200 Subject: [PATCH 10/22] [branding] add slideshowAPI value --- src/branding/manjaro/branding.desc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/branding/manjaro/branding.desc b/src/branding/manjaro/branding.desc index 061019b86..be15553bd 100644 --- a/src/branding/manjaro/branding.desc +++ b/src/branding/manjaro/branding.desc @@ -78,6 +78,19 @@ images: # installer is actually writing to disk and doing other slow things). slideshow: "show.qml" +# There are two available APIs for a QML slideshow: +# - 1 (the default) loads the entire slideshow when the installation- +# slideshow page is shown and starts the QML then. The QML +# is never stopped (after installation is done, times etc. +# continue to fire). +# - 2 loads the slideshow on startup and calls onActivate() and +# onLeave() in the root object. After the installation is done, +# the show is stopped (first by calling onLeave(), then destroying +# the QML components). +# +# An image slideshow does not need to have the API defined. +slideshowAPI: 1 + # Colors for text and background components. # # - sidebarBackground is the background of the sidebar From 19b48c3c8214a177aa757c314532b0f78a475740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Mon, 15 Jun 2020 12:35:52 +0200 Subject: [PATCH 11/22] [CMake] fix typo --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 09e5c6d1d..ce3f42ac4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -588,7 +588,7 @@ install( if( INSTALL_CONFIG ) install( FILES settings.conf - DESTINATIONshare/calamares + DESTINATION share/calamares ) endif() From 3fd088b338049e9176088499b2253013a1b51530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Tue, 14 Jul 2020 02:02:39 +0200 Subject: [PATCH 12/22] [branding] update to 20.1 Mikah --- 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 be15553bd..35c719aad 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: 20.0 - shortVersion: 20.0 - versionedName: Manjaro Linux 20.0 "Lysia" - shortVersionedName: Manjaro 20.0 + version: 20.1 + shortVersion: 20.1 + versionedName: Manjaro Linux 20.1 "Mikah" + shortVersionedName: Manjaro 20.1 bootloaderEntryName: Manjaro # These images are loaded from the branding module directory. From 4f6c4391fc0352e828896adb641697d1e3c7a927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Tue, 3 Nov 2020 10:10:10 +0100 Subject: [PATCH 13/22] [grubcfg] check obsolete --- src/modules/grubcfg/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py index 96a2f55af..7aadd174c 100644 --- a/src/modules/grubcfg/main.py +++ b/src/modules/grubcfg/main.py @@ -3,7 +3,7 @@ # # === This file is part of Calamares - === # -# SPDX-FileCopyrightText: 2014-2015,2019 Philip Müller +# SPDX-FileCopyrightText: 2014-2015,2019-2020 Philip Müller # SPDX-FileCopyrightText: 2015-2017 Teo Mrnjavac # SPDX-FileCopyrightText: 2017 Alf Gaida # SPDX-FileCopyrightText: 2017 2019, Adriaan de Groot @@ -147,7 +147,7 @@ def modify_grub_default(partitions, root_mount_point, distributor): if cryptdevice_params: kernel_params.extend(cryptdevice_params) - if use_splash and not os.path.exists(os.path.join(root_mount_point, "usr/bin/grub-set-bootflag")): + if use_splash: kernel_params.append(use_splash) if os.path.exists(os.path.join(root_mount_point, "usr/lib/libapparmor.so")): From b47e25155e74d40dd387603fbeae9a192c3328e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 30 Jan 2021 11:08:39 +0100 Subject: [PATCH 14/22] [initcpiocfg] fix 'fsck' --- src/modules/initcpiocfg/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py index 64a67cbe3..88d509f07 100644 --- a/src/modules/initcpiocfg/main.py +++ b/src/modules/initcpiocfg/main.py @@ -185,7 +185,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point): elif (btrfs == "yes" and cpu['proc0']['vendor_id'].lower() == "genuineintel"): modules.append("crc32c-intel") - elif not os.path.exists(os.path.join(root_mount_point, "usr/bin/grub-set-bootflag")): + else: hooks.append("fsck") write_mkinitcpio_lines(hooks, modules, files, root_mount_point) From 7a4cd9cdcc44a6a170728bd3ac95d3e94b36b04a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Mon, 9 Aug 2021 07:57:37 +0000 Subject: [PATCH 15/22] [postcfg] adopt to symlinks in copy_tree() --- src/modules/postcfg/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/postcfg/main.py b/src/modules/postcfg/main.py index 78dccb8f2..e2cae9937 100644 --- a/src/modules/postcfg/main.py +++ b/src/modules/postcfg/main.py @@ -56,7 +56,7 @@ class ConfigController: def copy_folder(self, source, target): if exists("/" + source): - copy_tree("/" + source, join(self.root, target)) + copy_tree("/" + source, join(self.root, target), preserve_symlinks) def remove_pkg(self, pkg, path): if exists(join(self.root, path)): From 25b2f89d311d216476a84715e7b57d7b6e340ef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Mon, 9 Aug 2021 09:06:58 +0000 Subject: [PATCH 16/22] [postcfg] fix copy_tree() --- src/modules/postcfg/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/postcfg/main.py b/src/modules/postcfg/main.py index e2cae9937..013040380 100644 --- a/src/modules/postcfg/main.py +++ b/src/modules/postcfg/main.py @@ -56,7 +56,7 @@ class ConfigController: def copy_folder(self, source, target): if exists("/" + source): - copy_tree("/" + source, join(self.root, target), preserve_symlinks) + copy_tree("/" + source, join(self.root, target), preserve_symlinks=1) def remove_pkg(self, pkg, path): if exists(join(self.root, path)): From b09fefc4a64ccddd77b506d9fb99516ea022ec0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Fri, 24 Sep 2021 21:39:56 +0200 Subject: [PATCH 17/22] [fstab] remove double compress --- src/modules/fstab/fstab.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/fstab/fstab.conf b/src/modules/fstab/fstab.conf index 33fb2c937..44be02322 100644 --- a/src/modules/fstab/fstab.conf +++ b/src/modules/fstab/fstab.conf @@ -41,7 +41,7 @@ efiMountOptions: umask=0077 # The standard configuration applies asynchronous discard support and ssd optimizations to btrfs # and does nothing for other filesystems. ssdExtraMountOptions: - btrfs: discard=async,ssd,compress=zstd,commit=120 + btrfs: discard=async,ssd,commit=120 # Additional options added to each line in /etc/crypttab crypttabOptions: luks From 682d3b087f465654306a8cf5bf5d1eaf4afdea28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sun, 17 Oct 2021 16:46:32 +0200 Subject: [PATCH 18/22] [postcfg] deal with symlinks --- src/modules/postcfg/main.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/modules/postcfg/main.py b/src/modules/postcfg/main.py index 013040380..8f5f3396d 100644 --- a/src/modules/postcfg/main.py +++ b/src/modules/postcfg/main.py @@ -3,7 +3,7 @@ # # === This file is part of Calamares - === # -# Copyright 2014 - 2019, Philip Müller +# Copyright 2014 - 2021, Philip Müller # Copyright 2016, Artoo # # Calamares is free software: you can redistribute it and/or modify @@ -21,6 +21,7 @@ import libcalamares import subprocess +import os from shutil import copy2 from distutils.dir_util import copy_tree @@ -50,6 +51,13 @@ class ConfigController: def terminate(self, proc): target_env_call(['killall', '-9', proc]) + def remove_symlink(self, target): + for root, dirs, files in os.walk("/" + target): + for filename in files: + path = os.path.join(root, filename) + if os.path.islink(path): + os.unlink(path) + def copy_file(self, file): if exists("/" + file): copy2("/" + file, join(self.root, file)) @@ -96,9 +104,8 @@ class ConfigController: elif cpu_ucode == "GenuineIntel": self.remove_pkg("amd-ucode", "boot/amd-ucode.img") - # Remove calamares - self.remove_pkg("calamares", "usr/bin/calamares") - self.remove_pkg("calamares-git", "usr/bin/calamares") + # Remove symlinks before copying + self.remove_symlink('root') # Copy skel to root self.copy_folder('etc/skel', 'root') @@ -133,6 +140,10 @@ class ConfigController: self.rmdir("opt/mhwd") self.umount("etc/resolv.conf") + # Remove calamares + self.remove_pkg("calamares", "usr/bin/calamares") + self.remove_pkg("calamares-git", "usr/bin/calamares") + return None From e36df223239c046a1b0636549da48d7e20e529fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Thu, 28 Oct 2021 13:39:27 +0200 Subject: [PATCH 19/22] [postcfg] we should also check for folders --- src/modules/postcfg/main.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/postcfg/main.py b/src/modules/postcfg/main.py index 8f5f3396d..e326ca8aa 100644 --- a/src/modules/postcfg/main.py +++ b/src/modules/postcfg/main.py @@ -56,7 +56,11 @@ class ConfigController: for filename in files: path = os.path.join(root, filename) if os.path.islink(path): - os.unlink(path) + os.unlink(path) + for folder in dirs: + path = os.path.join(root, folder) + if os.path.islink(path): + os.unlink(path) def copy_file(self, file): if exists("/" + file): From 21641bd2a2e1b0f8b0b030c9f1a20ccbd30556a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Tue, 9 Nov 2021 01:44:34 +0100 Subject: [PATCH 20/22] [partition] offer /boot also when other EFI partition was specified - it still makes sense to offer /boot in EFI - example: /boot ext4, /boot/efi vfat - this partly reverts 60f8a7c5fb276cac4b9c802f5d3fcedb54e56668 --- src/modules/partition/gui/PartitionDialogHelpers.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/modules/partition/gui/PartitionDialogHelpers.cpp b/src/modules/partition/gui/PartitionDialogHelpers.cpp index 0d25c3c8d..7ea57c565 100644 --- a/src/modules/partition/gui/PartitionDialogHelpers.cpp +++ b/src/modules/partition/gui/PartitionDialogHelpers.cpp @@ -23,15 +23,11 @@ QStringList standardMountPoints() { - QStringList mountPoints { "/", "/home", "/opt", "/srv", "/usr", "/var" }; + QStringList mountPoints { "/", "/boot", "/home", "/opt", "/srv", "/usr", "/var" }; if ( PartUtils::isEfiSystem() ) { mountPoints << Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString(); } - else - { - mountPoints << QStringLiteral( "/boot" ); - } mountPoints.removeDuplicates(); mountPoints.sort(); return mountPoints; From deac7b545cadda6b07ffc5f7b88617f1bfd411d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Thu, 11 Nov 2021 01:18:35 +0000 Subject: [PATCH 21/22] [fstab] Remove space_cache from btrfs mount options --- src/modules/fstab/fstab.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/fstab/fstab.conf b/src/modules/fstab/fstab.conf index 44be02322..a8c752159 100644 --- a/src/modules/fstab/fstab.conf +++ b/src/modules/fstab/fstab.conf @@ -13,7 +13,7 @@ # options from this mapping. mountOptions: default: defaults,noatime - btrfs: defaults,noatime,space_cache,autodefrag,compress=zstd + btrfs: defaults,noatime,autodefrag,compress=zstd # 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, From 1a1c1eb6dde4d3980cbc1f7774ed4fb012bc2759 Mon Sep 17 00:00:00 2001 From: Artem Grinev Date: Sat, 11 Dec 2021 13:30:17 +0000 Subject: [PATCH 22/22] [fstab] Remove additional ssd options for btrfs --- src/modules/fstab/fstab.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/fstab/fstab.conf b/src/modules/fstab/fstab.conf index 7110c5a5f..1e87acddc 100644 --- a/src/modules/fstab/fstab.conf +++ b/src/modules/fstab/fstab.conf @@ -55,7 +55,7 @@ efiMountOptions: umask=0077 # The standard configuration applies asynchronous discard support and ssd optimizations to btrfs # and does nothing for other filesystems. ssdExtraMountOptions: - btrfs: discard=async,ssd,commit=120 + btrfs: discard=async # Additional options added to each line in /etc/crypttab crypttabOptions: luks