calamares/modules: update fstab.conf to fix btrfs flags; also refresh bootloader.conf and displaymanager.conf

calamares/etc/calamares/modules/bootloader.conf

@@ -1,6 +1,16 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Bootloader configuration. The bootloader is installed to allow
+# the system to start (and pick one of the installed operating
+# systems to run).
+#
+# Take note that Debian-derivatives that use unmodified GRUB EFI packages
+# should specifically set *efiBootloaderId* to "debian" because that is
+# hard-coded in `grubx64.efi`.
 ---
 # Define which bootloader you want to use for EFI installations
-# Possible options are 'grub' and 'systemd-boot'.
+# Possible options are 'grub', 'sh-shim' and 'systemd-boot'.
 efiBootLoader: "grub"
 
 # systemd-boot configuration files settings, set kernel and initramfs file names
@@ -9,19 +19,57 @@ kernel: "/vmlinuz"
 img: "/initramfs.img"
 fallback: "/initramfs-failsafe.img"
 timeout: "10"
+
 # Optionally set the menu entry name and kernel name to use in systemd-boot.
 # If not specified here, these settings will be taken from branding.desc.
+#
 # bootloaderEntryName: "Generic GNU/Linux"
 # kernelLine: ", with Stable-Kernel"
 # fallbackKernelLine:  ", with Stable-Kernel (fallback initramfs)"
 
 # GRUB 2 binary names and boot directory
 # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
+# These names are also used when using sb-shim, since that needs some
+# GRUB functionality (notably grub-probe) to work. As needed, you may use
+# complete paths like `/usr/bin/efibootmgr` for the executables.
+#
 grubInstall: "grub-install"
 grubMkconfig: "grub-mkconfig"
 grubCfg: "/boot/grub/grub.cfg"
-# Optionally set the --bootloader-id to use for EFI. If not set, this defaults
-# to the bootloaderEntryName from branding.desc with problematic characters
-# replaced. If an efiBootloaderId is specified here, it is taken to already be a
-# valid directory name, so no such postprocessing is done in this case.
+grubProbe: "grub-probe"
+efiBootMgr: "efibootmgr"
+
+# Optionally set the bootloader ID to use for EFI. This is passed to
+# grub-install --bootloader-id.
+#
+# If not set here, the value from bootloaderEntryName from branding.desc
+# is used, with problematic characters (space and slash) replaced.
+#
+# The ID is also used as a directory name within the EFI environment,
+# and the bootloader is copied from /boot/efi/EFI/<dirname>/ . When
+# setting the option here, keep in mind that the name is sanitized
+# (problematic characters, see above, are replaced).
+#
+# There are some special words possible at the end of *efiBootloaderId*:
+#   @@SERIAL@@ can be used to obtain a uniquely-numbered suffix
+#       that is added to the Id (yielding, e.g., `dirname1` or `dirname72`)
+#   @@RANDOM@@ can be used to obtain a unique 4-digit hex suffix
+#   @@PHRASE@@ can be used to obtain a unique 1-to-3-word suffix
+#       from a dictionary of space-themed words
+# These words must be at the **end** of the *efiBootloaderId* value.
+# There must also be at most one of them. If there is none, no suffix-
+# processing is done and the *efiBootloaderId* is used unchanged.
+#
+# NOTE: Debian derivatives that use the unmodified Debian GRUB EFI
+#       packages may need to set this to "debian" because that is
+#       hard-coded in `grubx64.efi`.
+#
 # efiBootloaderId: "dirname"
+
+# Optionally install a copy of the GRUB EFI bootloader as the EFI
+# fallback loader (either bootia32.efi or bootx64.efi depending on
+# the system). This may be needed on certain systems (Intel DH87MC
+# seems to be the only one). If you set this to false, take care
+# to add another module to optionally install the fallback on those
+# boards that need it.
+installEFIFallback: true

calamares/etc/calamares/modules/displaymanager.conf

@@ -1,7 +1,20 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Configure one or more display managers (e.g. SDDM)
+# with a "best effort" approach.
+#
+# This module also sets up autologin, if the feature is enabled in
+# globalstorage (where it would come from the users page).
 ---
-#The DM module attempts to set up all the DMs found in this list, in that precise order.
-#It also sets up autologin, if the feature is enabled in globalstorage.
-#The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here.
+# The DM module attempts to set up all the DMs found in this list, in the
+# precise order listed. The displaymanagers list can also be set in
+# globalstorage, and in that case it overrides the setting here.
+#
+# If *sysconfigSetup* is set to *true* (see below, only relevant for
+# openSUSE derivatives) then this list is ignored and only sysconfig
+# is attempted. You can also list "sysconfig" in this list instead.
+#
 displaymanagers:
   - slim
   - sddm
@@ -10,8 +23,27 @@ displaymanagers:
   - mdm
   - lxdm
   - kdm
+  - greetd
+
+# Enable the following settings to force a desktop environment
+# in your displaymanager configuration file. This will attempt
+# to configure the given DE (without checking if it is installed).
+# The DM configuration for each potential DM may **or may not**
+# support configuring a default DE, so the keys are mandatory
+# but their interpretation is up to the DM configuration.
+#
+# Subkeys of *defaultDesktopEnvironment* are (all mandatory):
+#  - *executable* a full path to an executable
+#  - *desktopFile* a .desktop filename
+#
+# If this is **not** set, then Calamares will look for installed
+# DE's and pick the first one it finds that is actually installed.
+#
+# If this **is** set, and the *executable* key doesn't point to
+# an installed file, then the .desktop file's TryExec key is
+# used instead.
+#
 
-#Enable the following settings to force a desktop environment in your displaymanager configuration file:
 #defaultDesktopEnvironment:
 #    executable: "startkde"
 #    desktopFile: "plasma"
@@ -23,4 +55,8 @@ basicSetup: false
 
 # If true, setup autologin for openSUSE. This only makes sense on openSUSE
 # derivatives or other systems where /etc/sysconfig/displaymanager exists.
+#
+# The preferred way to pick sysconfig is to just list it in the
+# *displaymanagers* list (as the only one).
+#
 sysconfigSetup: false

calamares/etc/calamares/modules/fstab.conf

@@ -1,13 +1,86 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Creates /etc/fstab and /etc/crypttab in the target system.
+# Also creates mount points for all the filesystems.
+#
+# When creating fstab entries for a filesystem, this module
+# uses the options for the filesystem type to write to the
+# options field of the file.
 ---
+# Mount options to use for all filesystems. If a specific filesystem
+# is listed here, use those options, otherwise use the *default*
+# options from this mapping.
+#
+# With kernels 5.15 and newer be cautious of adding the option space_cache
+# to the btrfs mount options.  The default in 5.15 changed to space_cache=v2.
+# If space_cache or space_cache=v1 are specified, it may fail to remount.
+#
+# btrfs_swap options are used when a swapfile is chosen with a btrfs root
+# the options are applied to the subvolume which holds the swap partition
+#
+# The settings shown here apply only the btrfs defaults; these
+# are generally the right ones. Commented-out lines show other
+# options wich **might** be applicable for specific situations.
 mountOptions:
     default: defaults,noatime
-    btrfs: defaults,noatime,space_cache,autodefrag
+    # btrfs: defaults,noatime,autodefrag,compress=zstd
+    btrfs: defaults
+    # btrfs_swap: defaults,noatime
+    btrfs_swap: defaults
+
+# 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,
+# *default* from *mountOptions*.
+efiMountOptions: umask=0077
+
+# If a filesystem is on an SSD, add the following options. If a specific
+# filesystem is listed here, use those options, otherwise no additional
+# options are set (i.e. there is no *default* like in *mountOptions*).
+#
+# This example configuration applies the *discard* option to most
+# common filesystems on an SSD. This may not be the right option
+# for your distribution. If you use a systemd timer to trim the
+# SSD, it may interfere with the *discard* option. Opinions vary
+# as to whether *discard* is worth the effort -- it depends on
+# the usage pattern of the disk as well.
+#
+# ssdExtraMountOptions:
+#     ext4: discard
+#     jfs: discard
+#     xfs: discard
+#     swap: discard
+#     btrfs: discard,compress=lzo
+#
+# The standard configuration applies asynchronous discard support and ssd optimizations to btrfs
+# and does nothing for other filesystems.
 ssdExtraMountOptions:
-    ext4: discard
-    jfs: discard
-    xfs: discard
-    swap: discard
-    btrfs: discard,compress=lzo
+    btrfs: discard=async,ssd
+
+# Additional options added to each line in /etc/crypttab
 crypttabOptions: luks
 # For Debian and Debian-based distributions, change the above line to:
 # crypttabOptions: luks,keyscript=/bin/cat
+
+# Options for handling /tmp in /etc/fstab
+# Currently default (required) and ssd are supported
+# The corresponding string can contain the following variables:
+# tmpfs: true or tmpfs: false to either mount /tmp as tmpfs or not
+# options: "<mount options>"
+#
+# Example:
+#tmpOptions:
+#    default:
+#        tmpfs: false
+#        options: ""
+#    ssd:
+#        tmpfs: true
+#        options: "defaults,noatime,mode=1777"
+#
+tmpOptions:
+    default:
+        tmpfs: false
+        options: ""
+    ssd:
+        tmpfs: true
+        options: "defaults,noatime,mode=1777"