From cba5b9e4fb00e8c8fec7e60a7d24180bb4251a79 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 21 Jun 2021 22:56:23 +0200 Subject: [PATCH] [partition]: restore defaultFileSystemType in config Add the old key back, document the new key, expand schema. --- src/modules/partition/partition.conf | 8 ++++++++ src/modules/partition/partition.schema.yaml | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf index c9a72655b..a900bdf48 100644 --- a/src/modules/partition/partition.conf +++ b/src/modules/partition/partition.conf @@ -137,6 +137,14 @@ initialSwapChoice: none # If nothing is specified, Calamares defaults to "ext4". # # Names are case-sensitive and defined by KPMCore. +defaultFileSystemType: "ext4" + +# Selectable filesystem type, used when "erase" is done. +# +# When erasing the disk, the *defaultFileSystemType* is used (see +# above), but it is also possible to give users a choice: +# list suitable filesystems here. A drop-down is provided +# to pick which is the filesystems will be used. availableFileSystemTypes: ["ext4", "btrfs", "f2fs"] # Show/hide LUKS related functionality in automated partitioning modes. diff --git a/src/modules/partition/partition.schema.yaml b/src/modules/partition/partition.schema.yaml index 16cc08319..6c65e8ae7 100644 --- a/src/modules/partition/partition.schema.yaml +++ b/src/modules/partition/partition.schema.yaml @@ -18,6 +18,8 @@ properties: alwaysShowPartitionLabels: { type: boolean, default: true } defaultFileSystemType: { type: string } + availableFileSystemTypes: { type: array, items: { type: string } } + enableLuksAutomatedPartitioning: { type: boolean, default: false } allowManualPartitioning: { type: boolean, default: true } partitionLayout: { type: array } # TODO: specify items