Revert "sysusers/firstboot: temporarily disable LoadCredential"

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.

diff --git a/units/systemd-firstboot.service b/units/systemd-firstboot.service
index 70bc67e1d63d2fb98001faa5e5c043c74af68f81..2e57b064c183d9a2219fa97829109d458578bd17 100644 (file)
--- 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 460ff387f25d2517ec9831e4145071560715cc97..47373307b32a527bf9cb0caf9232afe11c3a4938 100644 (file)
--- 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