[neon/neon/calamares-settings/Neon/unstable] desktop/calamares/desktop/modules: update fstab.conf for new syntax

[Jonathan Esk-Riddell]

Git commit d2bc90793843b59b8f4d8520d0beec84e8077923 by Jonathan Esk-Riddell.
Committed on 27/06/2022 at 15:39.
Pushed by jriddell into branch 'Neon/unstable'.

update fstab.conf for new syntax

M  +29   -21   desktop/calamares/desktop/modules/fstab.conf

https://invent.kde.org/neon/neon/calamares-settings/commit/d2bc90793843b59b8f4d8520d0beec84e8077923

diff --git a/desktop/calamares/desktop/modules/fstab.conf b/desktop/calamares/desktop/modules/fstab.conf
index 38d79c6..a70eb21 100644
--- a/desktop/calamares/desktop/modules/fstab.conf
+++ b/desktop/calamares/desktop/modules/fstab.conf
@@ -1,29 +1,37 @@
-# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-# SPDX-FileCopyrightText: 2018-2020 Harald Sitter <sitter at kde.org>
+# 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.
+# uses the options previously defined in the mount module
 ---
-# 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.
-mountOptions:
-    default: defaults,noatime
-    btrfs: defaults,noatime,space_cache,autodefrag
-
-# 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*).
-ssdExtraMountOptions:
-    ext4: discard
-    jfs: discard
-    xfs: discard
-    swap: discard
-    btrfs: discard,compress=lzo
 
 # Additional options added to each line in /etc/crypttab
-crypttabOptions: luks,discard
+# 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"