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

Fix YAML schemas for all the remaining config files

Browse Source
This commit is contained in:
Adriaan de Groot 2020-08-12 10:27:17 +02:00
parent 14afce538b
commit 050d74b4be
7 changed files with 63 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/modules/fstab/fstab.schema.yaml
View File

@ -4,16 +4,22 @@ $id: https://calamares.io/schemas/fstab
additionalProperties: false additionalProperties: false
type: object type: object
properties: properties:
"mountOptions": mountOptions:
type: map type: object
mapping: additionalProperties: true # we don't know which FS exist
"default": { type: string, required: true } properties:
"btrfs": { type: string, required: true } default: { type: string }
"ssdExtraMountOptions": btrfs: { type: string }
type: map required: [ default ]
mapping: ssdExtraMountOptions:
"ext4": { type: string, required: true } type: object
"jfs": { type: string, required: true } additionalProperties: true # we don't know which FS exist
"xfs": { type: string, required: true } properties:
"swap": { type: string, required: true } ext4: { type: string }
"btrfs": { type: string, required: true } jfs: { type: string }
xfs: { type: string }
swap: { type: string }
btrfs: { type: string }
efiMountOptions: { type: string }
crypttabOptions: { type: string }
required: [ mountOptions ]

4
src/modules/initcpio/initcpio.schema.yaml
View File

@ -4,4 +4,6 @@ $id: https://calamares.io/schemas/initcpio
additionalProperties: false additionalProperties: false
type: object type: object
properties: properties:
kernel: { type: string, required: true } kernel: { type: string }
be_unsafe: { type: boolean, default: false }
required: [ kernel ]

24
src/modules/license/license.schema.yaml
View File

@ -4,14 +4,16 @@ $id: https://calamares.io/schemas/license
additionalProperties: false additionalProperties: false
type: object type: object
properties: properties:
"entries": entries:
type: seq type: array
sequence: items:
- type: map type: object
mapping: additionalProperties: false
"id": { type: str } properties:
"name": { type: str } id: { type: string }
"vendor": { type: str } name: { type: string }
"type": { type: str } vendor: { type: string }
"url": { type: str } type: { type: string }
"required": { type: boolean, default: false } url: { type: string }
required: { type: boolean, default: false }
expand: { type: boolean, default: false }

3
src/modules/luksopenswaphookcfg/luksopenswaphookcfg.schema.yaml
View File

@ -4,4 +4,5 @@ $id: https://calamares.io/schemas/luksopenswaphookcfg
additionalProperties: false additionalProperties: false
type: object type: object
properties: properties:
"configFilePath": { type: string, required: true } configFilePath: { type: string }
required: [ configFilePath ]

41
src/modules/mount/mount.schema.yaml
View File

@ -4,21 +4,26 @@ $id: https://calamares.io/schemas/mount
additionalProperties: false additionalProperties: false
type: object type: object
properties: properties:
"extraMounts": # TODO: share the schema definition, since these are identical
type: seq extraMounts:
sequence: type: array
- type: map items:
mapping: type: object
"device": { type: string, required: true } additionalProperties: false
"fs": { type: str } properties:
"mountPoint": { type: string, required: true } device: { type: string }
"options": { type: str } fs: { type: string }
"extraMountsEfi": mountPoint: { type: string }
type: seq options: { type: string }
sequence: required: [ device, mountPoint ]
- type: map extraMountsEfi:
mapping: type: array
"device": { type: string, required: true } items:
"fs": { type: str } type: object
"mountPoint": { type: string, required: true } additionalProperties: false
"options": { type: str } properties:
device: { type: string }
fs: { type: string }
mountPoint: { type: string }
options: { type: string }
required: [ device, mountPoint ]

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

@ -4,4 +4,4 @@ $id: https://calamares.io/schemas/plymouthcfg
additionalProperties: false additionalProperties: false
type: object type: object
properties: properties:
plymouth_theme: { type: str } plymouth_theme: { type: string }

3
src/modules/removeuser/removeuser.schema.yaml
View File

@ -4,4 +4,5 @@ $id: https://calamares.io/schemas/removeuser
additionalProperties: false additionalProperties: false
type: object type: object
properties: properties:
"username": { type: string, required: true } username: { type: string }
required: [ username ]