Skip to content

Commit

Permalink
Revert "sysusers/firstboot: temporarily disable LoadCredential"
Browse files Browse the repository at this point in the history
This reverts commit 7c20dd4.

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.
  • Loading branch information
bluca authored and yuwata committed May 3, 2021
1 parent 7afc8ab commit d4d7127
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
16 changes: 7 additions & 9 deletions units/systemd-firstboot.service
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 3 additions & 5 deletions units/systemd-sysusers.service
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit d4d7127

Please sign in to comment.