From 463545290e1586b0055e73b6471fc9692b93f764 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 18 Jun 2020 16:12:12 +0200
Subject: [PATCH] [users] Fix up schema syntax

- Remove schema items *availableShells* and *avatarFilePath* because
  those have no implementation.
---
 src/modules/users/users.conf        |  2 +-
 src/modules/users/users.schema.yaml | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/modules/users/users.conf b/src/modules/users/users.conf
index 174a60142..32f74978a 100644
--- a/src/modules/users/users.conf
+++ b/src/modules/users/users.conf
@@ -124,7 +124,7 @@ allowWeakPasswordsDefault: false
 #    and rely on a correct configuration file in /etc/default/useradd
 #  - set, non-empty, use that path as shell. No validation is done
 #    that the shell actually exists or is executable.
-# userShell: /bin/bash
+userShell: /bin/bash
 
 # Hostname setting
 #
diff --git a/src/modules/users/users.schema.yaml b/src/modules/users/users.schema.yaml
index b667df7f6..a3bba5078 100644
--- a/src/modules/users/users.schema.yaml
+++ b/src/modules/users/users.schema.yaml
@@ -4,15 +4,15 @@ $id: https://calamares.io/schemas/users
 additionalProperties: false
 type: object
 properties:
-    "defaultGroups":
-        required: true
-        type: seq
-        sequence:
-            - { type: str }
-    "autologinGroup": { type: string, required: true }
-    "doAutologin": { type: boolean, default: true }
-    "sudoersGroup": { type: string, required: true }
-    "setRootPassword": { type: boolean, default: true }
-    "availableShells": { type: str }
-    "avatarFilePath": { type: str }
-    "doReusePassword": { type: boolean, default: true }
+    defaultGroups:
+        type: array
+        items: { type: string }
+    autologinGroup: { type: string }
+    doAutologin: { type: boolean, default: true }
+    sudoersGroup: { type: string }
+    setRootPassword: { type: boolean, default: true }
+    doReusePassword: { type: boolean, default: true }
+required:
+    - defaultGroups
+    - autologinGroup
+    - sudoersGroup