shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-11 04:58:19 +03:00
Code

Revert "sysusers/firstboot: temporarily disable LoadCredential"

Browse Source 
This reverts commit 7c20dd4b6ef6e69862576722ac69b895d7a92dc9.

Debian has now been updated to patch the issue, so SemaphoreCI should
no longer fail. The fix has also been backported to the affected
stable branches.
This commit is contained in:
Luca Boccassi 2021-05-02 16:05:48 +01:00 committed by Yu Watanabe
parent 7afc8abdf3
commit d4d7127d94
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
units/systemd-firstboot.service
View File

@ -29,12 +29,10 @@ 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.
# 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
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,8 +25,6 @@ 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.
# 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=passwd.hashed-password.root
LoadCredential=passwd.plaintext-password.root
LoadCredential=passwd.shell.root