shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-08 21:17:47 +03:00
Code

sysusers/firstboot: temporarily disable LoadCredential

Browse Source 
Single-param LoadCredential= in units causes systemd v247/v248 to
assert when parsing. Disable it for now, until the fix is merged
in the stable trees, released and available (eg: in Debian
for the CI)

See: https://github.com/systemd/systemd/issues/19178
This commit is contained in:
Luca Boccassi 2021-04-02 16:30:43 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent f3e58b55de
commit 7c20dd4b6e
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
units/systemd-firstboot.service
View File

@ -29,10 +29,12 @@ StandardError=tty
# Optionally, pick up basic fields from credentials passed to the service
# manager. This is useful for importing this data from nspawn's
# --set-credential= switch.
LoadCredential=passwd.hashed-password.root
LoadCredential=passwd.plaintext-password.root
LoadCredential=passwd.shell.root
LoadCredential=firstboot.locale
LoadCredential=firstboot.locale-messages
LoadCredential=firstboot.keymap
LoadCredential=firstboot.timezone
# FIXME: temporarily disabled as it causes asserts on v247/v248, see:
# https://github.com/systemd/systemd/issues/19178
#LoadCredential=passwd.hashed-password.root
#LoadCredential=passwd.plaintext-password.root
#LoadCredential=passwd.shell.root
#LoadCredential=firstboot.locale
#LoadCredential=firstboot.locale-messages
#LoadCredential=firstboot.keymap
#LoadCredential=firstboot.timezone

8
units/systemd-sysusers.service
View File

@ -25,6 +25,8 @@ TimeoutSec=90s
# Optionally, pick up a root password and shell for the root user from a
# credential passed to the service manager. This is useful for importing this
# data from nspawn's --set-credential= switch.
LoadCredential=passwd.hashed-password.root
LoadCredential=passwd.plaintext-password.root
LoadCredential=passwd.shell.root
# FIXME: temporarily disabled as it causes asserts on v247/v248, see:
# https://github.com/systemd/systemd/issues/19178
#LoadCredential=passwd.hashed-password.root
#LoadCredential=passwd.plaintext-password.root
#LoadCredential=passwd.shell.root