Revert "sysusers/firstboot: temporarily disable LoadCredential"

This reverts commit 7c20dd4b6e.

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

View file

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

View file

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