From f85c70d4d2c731dc66bae4a0cc42e4946f2330b0 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 7 Aug 2020 11:55:16 +0200
Subject: [PATCH] [grubcfg] Introduce prefer_grub_d

- new setting for using /etc/defaults/grub.d/ (SEE #1457), not implemented
- add missing fields to schema for config file
---
 src/modules/grubcfg/grubcfg.conf        | 5 +++++
 src/modules/grubcfg/grubcfg.schema.yaml | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/modules/grubcfg/grubcfg.conf b/src/modules/grubcfg/grubcfg.conf
index ba31d6070..374561787 100644
--- a/src/modules/grubcfg/grubcfg.conf
+++ b/src/modules/grubcfg/grubcfg.conf
@@ -17,6 +17,11 @@
 # already existed. If set to false, edits the existing file instead.
 overwrite: false
 
+# If set to true, prefer to write files in /etc/default/grub.d/
+# rather than the single file /etc/default/grub. If this is set,
+# Calamares will write /etc/default/grub.d/00Calamares instead.
+prefer_grub_d: false
+
 # If set to true, an **existing** setting for GRUB_DISTRIBUTOR is
 # kept, not updated to the *bootloaderEntryName* from the branding file.
 # Use this if the GRUB_DISTRIBUTOR setting in the file is "smart" in
diff --git a/src/modules/grubcfg/grubcfg.schema.yaml b/src/modules/grubcfg/grubcfg.schema.yaml
index 5121e2be7..f010ac694 100644
--- a/src/modules/grubcfg/grubcfg.schema.yaml
+++ b/src/modules/grubcfg/grubcfg.schema.yaml
@@ -5,6 +5,8 @@ additionalProperties: false
 type: object
 properties:
     overwrite: { type: boolean, default: false }
+    keepDistributor: { type: boolean, default: false }
+    prefer_grub_d: { type: boolean, default: false }
     defaults:
         type: object
         additionalProperties: true  # Other fields are acceptable