summaryrefslogtreecommitdiffstats
path: root/units/systemd-firstboot.service
diff options
context:
space:
mode:
authorLuca Boccassi <bluca@debian.org>2021-05-02 17:05:48 +0200
committerYu Watanabe <watanabe.yu+github@gmail.com>2021-05-03 05:16:35 +0200
commitd4d7127d94c13cd1b88232fb0c138c619e1bae16 (patch)
treed36b606e56acdd17ba63c6c3e5691e273c822577 /units/systemd-firstboot.service
parentMerge pull request #19487 from mrc0mmand/test-all-services-in-TEST-01 (diff)
downloadsystemd-d4d7127d94c13cd1b88232fb0c138c619e1bae16.tar.xz
systemd-d4d7127d94c13cd1b88232fb0c138c619e1bae16.zip
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.
Diffstat (limited to 'units/systemd-firstboot.service')
-rw-r--r--units/systemd-firstboot.service16
1 files changed, 7 insertions, 9 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