napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[grubcfg] Introduce prefer_grub_d

Browse Source 
- new setting for using /etc/defaults/grub.d/ (SEE #1457), not implemented
- add missing fields to schema for config file
This commit is contained in:
Adriaan de Groot 2020-08-07 11:55:16 +02:00
parent 3fc23e3b07
commit f85c70d4d2
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/grubcfg/grubcfg.conf
View File

@ -17,6 +17,11 @@
# already existed. If set to false, edits the existing file instead. # already existed. If set to false, edits the existing file instead.
overwrite: false 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 # If set to true, an **existing** setting for GRUB_DISTRIBUTOR is
# kept, not updated to the *bootloaderEntryName* from the branding file. # kept, not updated to the *bootloaderEntryName* from the branding file.
# Use this if the GRUB_DISTRIBUTOR setting in the file is "smart" in # Use this if the GRUB_DISTRIBUTOR setting in the file is "smart" in

2
src/modules/grubcfg/grubcfg.schema.yaml
View File

@ -5,6 +5,8 @@ additionalProperties: false
type: object type: object
properties: properties:
overwrite: { type: boolean, default: false } overwrite: { type: boolean, default: false }
keepDistributor: { type: boolean, default: false }
prefer_grub_d: { type: boolean, default: false }
defaults: defaults:
type: object type: object
additionalProperties: true # Other fields are acceptable additionalProperties: true # Other fields are acceptable