From b06498194e177a3067cb2d7d22bda6e8c5a8eb5e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 28 Jul 2020 14:46:56 +0200
Subject: [PATCH] [machineid] Fix up schema

- schema didn't allow recent (2019) configuration entries
- remove mention of deprecated key from example config
---
 src/modules/machineid/machineid.conf        |  2 --
 src/modules/machineid/machineid.schema.yaml | 10 +++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/modules/machineid/machineid.conf b/src/modules/machineid/machineid.conf
index 97bd10a06..fa42655fd 100644
--- a/src/modules/machineid/machineid.conf
+++ b/src/modules/machineid/machineid.conf
@@ -15,8 +15,6 @@ dbus: true
 # Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id
 # (ignored if dbus is false, or if there is no /etc/machine-id to point to).
 dbus-symlink: true
-# this is a deprecated form of *dbus-symlink*
-symlink: true
 
 # Whether to create an entropy file
 entropy: false
diff --git a/src/modules/machineid/machineid.schema.yaml b/src/modules/machineid/machineid.schema.yaml
index 588a7fa4e..c5eb55b1b 100644
--- a/src/modules/machineid/machineid.schema.yaml
+++ b/src/modules/machineid/machineid.schema.yaml
@@ -4,6 +4,10 @@ $id: https://calamares.io/schemas/machineid
 additionalProperties: false
 type: object
 properties:
-    "systemd": { type: boolean, default: true }
-    "dbus": { type: boolean, default: true }
-    "symlink": { type: boolean, default: true }
+    systemd: { type: boolean, default: true }
+    dbus: { type: boolean, default: true }
+    "dbus-symlink": { type: boolean, default: true }
+    entropy: { type: boolean, default: false }
+    "entropy-copy": { type: boolean, default: false }
+    # Deprecated properties
+    symlink: { type: boolean, default: true }