calamares: partition.conf: update to work with calamares 3.2.15

calamares/etc/calamares/modules/partition.conf

@@ -3,22 +3,41 @@
 # etc.) use just /boot.
 efiSystemPartition:     "/boot/efi"
 
-# Make sure an autogenerated swap partition is big enough for hibernation in
+# This optional setting specifies the size of the EFI system partition.
-# automated partitioning modes. Swap can be disabled through *neverCreateSwap*.
+# If nothing is specified, the default size of 300MiB will be used.
-#
+# efiSystemPartitionSize:     300M
-# When *ensureSuspendToDisk* is true, swap is never smaller than physical
-# memory, follows the guideline 2 * memory until swap reaches 8GiB.
-# When *ensureSuspendToDisk* is false, swap size scales up with memory
-# size until 8GiB, then at roughly half of memory size.
-#
-#
-# Default is true.
-ensureSuspendToDisk:    true
 
-# Never create swap partitions in automated partitioning modes.
+# In autogenerated partitioning, allow the user to select a swap size?
-# If this is true, ensureSuspendToDisk is ignored.
+# If there is exactly one choice, no UI is presented, and the user
-# Default is false.
+# cannot make a choice -- this setting is used. If there is more than
-neverCreateSwap:        false
+# one choice, a UI is presented.
+#
+# Legacy settings *neverCreateSwap* and *ensureSuspendToDisk* correspond
+# to values of *userSwapChoices* as follows:
+#    - *neverCreateSwap* is true, means [none]
+#    - *neverCreateSwap* is false, *ensureSuspendToDisk* is false, [small]
+#    - *neverCreateSwap* is false, *ensureSuspendToDisk* is true, [suspend]
+#
+# Autogenerated swap sizes are as follows:
+#    - *suspend*: Swap is always at least total memory size,
+#      and up to 4GiB RAM follows the rule-of-thumb 2 * memory;
+#      from 4GiB to 8 GiB it stays steady at 8GiB, and over 8 GiB memory
+#      swap is the size of main memory.
+#    - *small*: Follows the rules above, but Swap is at
+#      most 8GiB, and no more than 10% of available disk.
+# In both cases, a fudge factor (usually 10% extra) is applied so that there
+# is some space for administrative overhead (e.g. 8 GiB swap will allocate
+# 8.8GiB on disk in the end).
+userSwapChoices:
+    - none      # Create no swap, use no swap
+    - reuse     # Re-use existing swap, but don't create any (unsupported right now)
+    - small     # Up to 4GB
+    - suspend   # At least main memory size
+    - file      # To swap file instead of partition (unsupported right now)
+
+# LEGACY SETTINGS (these will generate a warning)
+# ensureSuspendToDisk:    true
+# neverCreateSwap:        false
 
 # Correctly draw nested (e.g. logical) partitions as such.
 drawNestedPartitions:   false
@@ -38,6 +57,8 @@ alwaysShowPartitionLabels: true
 #
 # Suggested values: ext2, ext3, ext4, reiser, xfs, jfs, btrfs
 # If nothing is specified, Calamares defaults to "ext4".
+#
+# Names are case-sensitive and defined by KPMCore.
 defaultFileSystemType:  "ext4"
 
 # Show/hide LUKS related functionality in automated partitioning modes.
@@ -56,7 +77,60 @@ defaultFileSystemType:  "ext4"
 # Support is offered to system integrators that wish to do so, through the
 # Calamares bug tracker, as well as in #calamares on Freenode.
 # For more information on setting up GRUB2 for Calamares with LUKS, see
-# https://github.com/calamares/calamares/wiki/LUKS-Deployment
+# https://github.com/calamares/calamares/wiki/Deploy-LUKS
 #
 # If nothing is specified, LUKS is enabled in automated modes.
 #enableLuksAutomatedPartitioning:    true
+
+# Allow manual partitioning.
+#
+# When set to false, this option hides the "Manual partitioning" button,
+# limiting the user's choice to "Erase", "Replace" or "Alongside".
+# This can be useful when using a custom partition layout we don't want
+# the user to modify.
+#
+# If nothing is specified, manual partitioning is enabled.
+#allowManualPartitioning:   true
+
+# To apply a custom partition layout, it has to be defined this way :
+#
+partitionLayout:
+     - name: "rootfs"
+       filesystem: "ext4"
+       mountPoint: "/"
+       size: 20%
+       minSize: 25G
+     - name: "home"
+       filesystem: "ext4"
+       mountPoint: "/home"
+       size: 80%
+       minSize: 5G
+#     - name: "data"
+#       filesystem: "fat32"
+#       mountPoint: "/data"
+#       size: 100%
+#
+# There can be any number of partitions, each entry having the following attributes:
+#   - name: partition label
+#   - filesystem: filesystem type
+#   - mountPoint: partition mount point
+#   - size: partition size in bytes (append 'K', 'M' or 'G' for KiB, MiB or GiB)
+#           or
+#           % of the available drive space if a '%' is appended to the value
+#   - minSize: minimum partition size (optional parameter)
+#   - maxSize: maximum partition size (optional parameter)
+
+# Checking for available storage
+#
+# This overlaps with the setting of the same name in the welcome module's
+# requirements section. If nothing is set by the welcome module, this
+# value is used instead. It is still a problem if there is no required
+# size set at all, and the replace and resize options will not be offered
+# if no required size is set.
+#
+# The value is in Gibibytes (GiB).
+#
+# BIG FAT WARNING: except for OEM-phase-0 use, you should be using
+#                  the welcome module, **and** configure this value in
+#                  `welcome.conf`, not here.
+requiredStorage: 8