From 3fc23e3b07da9c4036d24fb9aee77830e4319664 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 7 Aug 2020 11:43:48 +0200
Subject: [PATCH] [grubcfg] Fix config schema

---
 src/modules/grubcfg/grubcfg.schema.yaml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/modules/grubcfg/grubcfg.schema.yaml b/src/modules/grubcfg/grubcfg.schema.yaml
index 10aa34c2b..5121e2be7 100644
--- a/src/modules/grubcfg/grubcfg.schema.yaml
+++ b/src/modules/grubcfg/grubcfg.schema.yaml
@@ -4,12 +4,14 @@ $id: https://calamares.io/schemas/grubcfg
 additionalProperties: false
 type: object
 properties:
-    "overwrite": { type: boolean, default: false }
-    "defaults":
-        type: map
-        mapping:
-            "GRUB_TIMEOUT": { type: int, required: true }
-            "GRUB_DEFAULT": { type: string, required: true }
-            "GRUB_DISABLE_SUBMENU": { type: boolean, default: true }
-            "GRUB_TERMINAL_OUTPUT": { type: string, required: true }
-            "GRUB_DISABLE_RECOVERY": { type: boolean, default: true }
+    overwrite: { type: boolean, default: false }
+    defaults:
+        type: object
+        additionalProperties: true  # Other fields are acceptable
+        properties:
+            GRUB_TIMEOUT: { type: integer }
+            GRUB_DEFAULT: { type: string }
+            GRUB_DISABLE_SUBMENU: { type: boolean, default: true }
+            GRUB_TERMINAL_OUTPUT: { type: string }
+            GRUB_DISABLE_RECOVERY: { type: boolean, default: true }
+        required: [ GRUB_TIMEOUT, GRUB_DEFAULT, GRUB_TERMINAL_OUTPUT ]