summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Boccassi <bluca@debian.org>2021-04-02 16:30:43 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-04-06 12:02:42 +0200
commit7c20dd4b6ef6e69862576722ac69b895d7a92dc9 (patch)
tree23f18ad6899684f97708d612dfcff8b00f789bfe
parentf3e58b55def926ebaad714a2f32b74b355b56ed0 (diff)
downloadsystemd-7c20dd4b6ef6e69862576722ac69b895d7a92dc9.tar.gz
sysusers/firstboot: temporarily disable LoadCredential
Single-param LoadCredential= in units causes systemd v247/v248 to assert when parsing. Disable it for now, until the fix is merged in the stable trees, released and available (eg: in Debian for the CI) See: https://github.com/systemd/systemd/issues/19178
-rw-r--r--units/systemd-firstboot.service16
-rw-r--r--units/systemd-sysusers.service8
2 files changed, 14 insertions, 10 deletions
diff --git a/units/systemd-firstboot.service b/units/systemd-firstboot.service
index 2e57b064c1..70bc67e1d6 100644
--- a/units/systemd-firstboot.service
+++ b/units/systemd-firstboot.service
@@ -29,10 +29,12 @@ 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.
-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
+# 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
diff --git a/units/systemd-sysusers.service b/units/systemd-sysusers.service
index 47373307b3..460ff387f2 100644
--- a/units/systemd-sysusers.service
+++ b/units/systemd-sysusers.service
@@ -25,6 +25,8 @@ 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.
-LoadCredential=passwd.hashed-password.root
-LoadCredential=passwd.plaintext-password.root
-LoadCredential=passwd.shell.root
+# 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