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

[machineid] Fix up schema

Browse Source 
- schema didn't allow recent (2019) configuration entries
- remove mention of deprecated key from example config
This commit is contained in:
Adriaan de Groot 2020-07-28 14:46:56 +02:00
parent 506ea39508
commit b06498194e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/machineid/machineid.conf
View File

@ -15,8 +15,6 @@ dbus: true
# Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id # Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id
# (ignored if dbus is false, or if there is no /etc/machine-id to point to). # (ignored if dbus is false, or if there is no /etc/machine-id to point to).
dbus-symlink: true dbus-symlink: true
# this is a deprecated form of *dbus-symlink*
symlink: true
# Whether to create an entropy file # Whether to create an entropy file
entropy: false entropy: false

10
src/modules/machineid/machineid.schema.yaml
View File

@ -4,6 +4,10 @@ $id: https://calamares.io/schemas/machineid
additionalProperties: false additionalProperties: false
type: object type: object
properties: properties:
"systemd": { type: boolean, default: true } systemd: { type: boolean, default: true }
"dbus": { type: boolean, default: true } dbus: { type: boolean, default: true }
"symlink": { type: boolean, default: true } "dbus-symlink": { type: boolean, default: true }
entropy: { type: boolean, default: false }
"entropy-copy": { type: boolean, default: false }
# Deprecated properties
symlink: { type: boolean, default: true }