From 463ea3c73fac6fd8dd8fd239e660b222fc21d65e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 7 Aug 2020 10:50:33 +0200 Subject: [PATCH] [displaymanager] Fix config schema --- .../displaymanager/displaymanager.schema.yaml | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/modules/displaymanager/displaymanager.schema.yaml b/src/modules/displaymanager/displaymanager.schema.yaml index a16af732f..08923f726 100644 --- a/src/modules/displaymanager/displaymanager.schema.yaml +++ b/src/modules/displaymanager/displaymanager.schema.yaml @@ -4,13 +4,17 @@ $id: https://calamares.io/schemas/displaymanager additionalProperties: false type: object properties: - "displaymanagers": - type: seq - sequence: - - { type: string, required: true, enum: [slim, sddm, lightdm, gdm, mdm, lxdm, kdm] } - "defaultDesktopEnvironment": - type: map - mapping: - "executable": { type: str } - "desktopFile": { type: str } - "basicSetup": { type: boolean, default: false } + displaymanagers: + type: array + items: + type: string + enum: [slim, sddm, lightdm, gdm, mdm, lxdm, kdm] + minItems: 1 # Must be non-empty, if present at all + defaultDesktopEnvironment: + type: object + properties: + executable: { type: string } + desktopFile: { type: string } + required: [ executable, desktopFile ] + basicSetup: { type: boolean, default: false } + sysconfigSetup: { type: boolean, default: false }