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

[machineid] Improve config-documentation

Browse Source
This commit is contained in:
Adriaan de Groot 2020-10-23 17:16:24 +02:00
parent daeee09fdb
commit aa6109d470
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,21 +11,39 @@
#
---
# Whether to create /etc/machine-id for systemd.
# The default is *false*.
systemd: true
# Whether to create /var/lib/dbus/machine-id for D-Bus.
# The default is *false*.
dbus: true
# 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).
# The default is *false*.
dbus-symlink: true
# Whether to create an entropy file /var/lib/urandom/random-seed
#
# DEPRECATED: list the file in entropy-files instead
entropy: false
# Whether to copy entropy from the host
# Copy entropy from the host? If this is set to *true*, then
# any entropy file listed below will be copied from the host
# if it exists. Non-existent files will be generated from
# /dev/urandom . The default is *false*.
entropy-copy: false
# Which files to write (paths in the target)
# Which files to write (paths in the target). Each of these files is
# either generated from /dev/urandom or copied from the host, depending
# on the setting for *entropy-copy*, above.
entropy-files:
- /var/lib/urandom/random-seed
- /var/lib/systemd/random-seed
# Whether to create an entropy file /var/lib/urandom/random-seed
#
# DEPRECATED: list the file in entropy-files instead. If this key
# exists and is set to *true*, a warning is printed and Calamares
# behaves as if `/var/lib/urandom/random-seed` is listed in *entropy-files*.
#
# entropy: false
# Whether to create a symlink for D-Bus
#
# DEPRECATED: set *dbus-symlink* with the same meaning instead.
#
# symlink: false

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

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