From 5019b0cb15d788e5e1f3c15eb7cdca6ee18a847c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 20 Dec 2022 16:34:36 +0100 Subject: bootctl: downgrade graceful messages to LOG_NOTICE --- units/systemd-boot-random-seed.service | 29 +++++++++++++++++++++++++++++ units/systemd-boot-system-token.service | 29 ----------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 units/systemd-boot-random-seed.service delete mode 100644 units/systemd-boot-system-token.service (limited to 'units') diff --git a/units/systemd-boot-random-seed.service b/units/systemd-boot-random-seed.service new file mode 100644 index 0000000000..ef5577549e --- /dev/null +++ b/units/systemd-boot-random-seed.service @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Store a System Token in an EFI Variable +Documentation=man:systemd-boot-system-token.service(8) + +DefaultDependencies=no +After=local-fs.target systemd-random-seed.service +Conflicts=shutdown.target initrd-switch-root.target +Before=shutdown.target initrd-switch-root.target + +# Only run this if the boot loader can support random seed initialization. +ConditionPathExists=|/sys/firmware/efi/efivars/LoaderFeatures-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f +ConditionPathExists=|/sys/firmware/efi/efivars/StubFeatures-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f + +# Only run this if there is no system token defined yet +ConditionPathExists=!/sys/firmware/efi/efivars/LoaderSystemToken-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=bootctl random-seed --graceful diff --git a/units/systemd-boot-system-token.service b/units/systemd-boot-system-token.service deleted file mode 100644 index ef5577549e..0000000000 --- a/units/systemd-boot-system-token.service +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -# -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -[Unit] -Description=Store a System Token in an EFI Variable -Documentation=man:systemd-boot-system-token.service(8) - -DefaultDependencies=no -After=local-fs.target systemd-random-seed.service -Conflicts=shutdown.target initrd-switch-root.target -Before=shutdown.target initrd-switch-root.target - -# Only run this if the boot loader can support random seed initialization. -ConditionPathExists=|/sys/firmware/efi/efivars/LoaderFeatures-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f -ConditionPathExists=|/sys/firmware/efi/efivars/StubFeatures-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f - -# Only run this if there is no system token defined yet -ConditionPathExists=!/sys/firmware/efi/efivars/LoaderSystemToken-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=bootctl random-seed --graceful -- cgit v1.2.1