From d4d7127d94c13cd1b88232fb0c138c619e1bae16 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sun, 2 May 2021 16:05:48 +0100 Subject: [PATCH] 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. --- units/systemd-firstboot.service | 16 +++++++--------- 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 70bc67e1d63..2e57b064c18 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 460ff387f25..47373307b32 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