diff options
| -rw-r--r-- | units/systemd-firstboot.service | 16 | ||||
| -rw-r--r-- | units/systemd-sysusers.service | 8 |
2 files changed, 10 insertions, 14 deletions
diff --git a/units/systemd-firstboot.service b/units/systemd-firstboot.service index 70bc67e1d6..2e57b064c1 100644 --- a/units/systemd-firstboot.service +++ b/units/systemd-firstboot.service @@ -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 diff --git a/units/systemd-sysusers.service b/units/systemd-sysusers.service index 460ff387f2..47373307b3 100644 --- a/units/systemd-sysusers.service +++ b/units/systemd-sysusers.service @@ -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 |