Merge pull request #2091 from calamares/issue-2090
Allow overriding greetd user/group
This commit is contained in:
commit
a5ae67f93c
@ -59,3 +59,11 @@ basicSetup: false
|
|||||||
# *displaymanagers* list (as the only one).
|
# *displaymanagers* list (as the only one).
|
||||||
#
|
#
|
||||||
sysconfigSetup: false
|
sysconfigSetup: false
|
||||||
|
|
||||||
|
# Some DMs have specific settings. These can be customized here.
|
||||||
|
#
|
||||||
|
# greetd has configurable user and group; the user and group is created if it
|
||||||
|
# does not exist, and the user is set as default-session user.
|
||||||
|
greetd:
|
||||||
|
greeter_user: "tom_bombadil"
|
||||||
|
greeter_group: "wheel"
|
||||||
|
@ -20,3 +20,10 @@ properties:
|
|||||||
required: [ executable, desktopFile ]
|
required: [ executable, desktopFile ]
|
||||||
basicSetup: { type: boolean, default: false }
|
basicSetup: { type: boolean, default: false }
|
||||||
sysconfigSetup: { type: boolean, default: false }
|
sysconfigSetup: { type: boolean, default: false }
|
||||||
|
greetd:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
greeter_user: { type: string }
|
||||||
|
greeter_group: { type: string }
|
||||||
|
additionalProperties: false
|
||||||
|
|
||||||
|
@ -983,6 +983,11 @@ def run():
|
|||||||
# Do the actual configuration and collect messages
|
# Do the actual configuration and collect messages
|
||||||
dm_setup_message = []
|
dm_setup_message = []
|
||||||
for dm in dm_impl:
|
for dm in dm_impl:
|
||||||
|
dm_specific_configuration = libcalamares.job.configuration.get(dm.name, None)
|
||||||
|
if dm_specific_configuration and isinstance(dm_specific_configuration, dict):
|
||||||
|
for k, v in dm_specific_configuration.items():
|
||||||
|
if hasattr(dm, k):
|
||||||
|
setattr(dm, k, v)
|
||||||
dm_message = None
|
dm_message = None
|
||||||
if enable_basic_setup:
|
if enable_basic_setup:
|
||||||
dm_message = dm.basic_setup()
|
dm_message = dm.basic_setup()
|
||||||
|
Loading…
Reference in New Issue
Block a user