[bootloader] Fix schema file for config
A stray "machineid" was added, without a type definition, so the config file -- which doesn't mention machineid at all -- was considered invalid. Drop it because the key isn't mentioned anywhere else.
This commit is contained in:
parent
c826e8e78a
commit
5a14c3c76f
@ -1,39 +1,31 @@
|
|||||||
#SPDX - FileCopyrightText : 2020 Adriaan de Groot < groot @kde.org>
|
#SPDX - FileCopyrightText : 2020 Adriaan de Groot < groot @kde.org>
|
||||||
#SPDX - License - Identifier : GPL - 3.0 - or -later
|
#SPDX - License - Identifier : GPL - 3.0 - or -later
|
||||||
---
|
-- -$schema : https : //json-schema.org/schema#
|
||||||
$schema: https://json-schema.org/schema#
|
|
||||||
$id : https : //calamares.io/schemas/bootloader
|
$id : https : //calamares.io/schemas/bootloader
|
||||||
additionalProperties: false
|
additionalProperties : false type : object properties : efiBootLoader
|
||||||
type: object
|
: { type : string } kernelSearchPath : { type : string } kernelName : { type : string } timeout:
|
||||||
properties:
|
{
|
||||||
efiBootLoader: { type: string }
|
type:
|
||||||
kernelSearchPath: { type: string }
|
string
|
||||||
kernelName: { type: string }
|
}
|
||||||
timeout: { type: string } # Inserted verbatim
|
#Inserted verbatim additionalInitrdFiles : type : array items : type : string bootloaderEntryName : {
|
||||||
additionalInitrdFiles:
|
type : string } kernelLine : { type : string } fallbackKernelLine:
|
||||||
type: array
|
{
|
||||||
items:
|
type:
|
||||||
type: string
|
string
|
||||||
bootloaderEntryName: { type: string }
|
}
|
||||||
kernelLine: { type: string }
|
|
||||||
fallbackKernelLine: { type: string }
|
|
||||||
|
|
||||||
#Programs
|
#Programs
|
||||||
grubInstall: { type: string }
|
grubInstall : { type : string } grubMkconfig : { type : string } grubCfg : { type : string } grubProbe
|
||||||
grubMkconfig: { type: string }
|
: { type : string } efiBootMgr : { type : string }
|
||||||
grubCfg: { type: string }
|
|
||||||
grubProbe: { type: string }
|
|
||||||
efiBootMgr: { type: string }
|
|
||||||
|
|
||||||
efiBootloaderId: { type: string }
|
efiBootloaderId : { type : string } installEFIFallback : { type : boolean }
|
||||||
installEFIFallback: { type: boolean }
|
|
||||||
|
|
||||||
required:
|
required
|
||||||
- efiBootLoader
|
: -efiBootLoader
|
||||||
- kernelSearchPath
|
- kernelSearchPath
|
||||||
- kernelName
|
- kernelName
|
||||||
- grubInstall
|
- grubInstall
|
||||||
- grubMkconfig
|
- grubMkconfig
|
||||||
- grubCfg
|
- grubCfg
|
||||||
- grubProbe
|
- grubProbe
|
||||||
- machineid
|
|
||||||
|
Loading…
Reference in New Issue
Block a user