[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:
Adriaan de Groot 2022-06-27 00:36:20 +02:00
parent c826e8e78a
commit 5a14c3c76f

View File

@ -1,39 +1,31 @@
#SPDX - FileCopyrightText : 2020 Adriaan de Groot < groot @kde.org>
#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
additionalProperties: false
type: object
properties:
efiBootLoader: { type: string }
kernelSearchPath: { type: string }
kernelName: { type: string }
timeout: { type: string } # Inserted verbatim
additionalInitrdFiles:
type: array
items:
type: string
bootloaderEntryName: { type: string }
kernelLine: { type: string }
fallbackKernelLine: { type: string }
additionalProperties : false type : object properties : efiBootLoader
: { type : string } kernelSearchPath : { type : string } kernelName : { type : string } timeout:
{
type:
string
}
#Inserted verbatim additionalInitrdFiles : type : array items : type : string bootloaderEntryName : {
type : string } kernelLine : { type : string } fallbackKernelLine:
{
type:
string
}
#Programs
grubInstall: { type: string }
grubMkconfig: { type: string }
grubCfg: { type: string }
grubProbe: { type: string }
efiBootMgr: { type: string }
grubInstall : { type : string } grubMkconfig : { type : string } grubCfg : { type : string } grubProbe
: { type : string } efiBootMgr : { type : string }
efiBootloaderId: { type: string }
installEFIFallback: { type: boolean }
efiBootloaderId : { type : string } installEFIFallback : { type : boolean }
required:
- efiBootLoader
required
: -efiBootLoader
- kernelSearchPath
- kernelName
- grubInstall
- grubMkconfig
- grubCfg
- grubProbe
- machineid