From: Daan De Meyer Date: Mon, 17 Jul 2023 08:11:54 +0000 (+0200) Subject: units: Add --graceful flag to pcrphase units X-Git-Tag: v254-rc3~38 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2aaa14d37e4257dd2f1fdc66063dc08a66d7f8b;p=thirdparty%2Fsystemd.git units: Add --graceful flag to pcrphase units Some of the new units using systemd-pcrphase are missing the --graceful flag which causes them to error if the tpm libraries are not installed. Add --graceful just like in the other pcrphase units to make systemd-pcrphase exit gracefully if the tpm libraries are missing. --- diff --git a/units/systemd-pcrfs-root.service.in b/units/systemd-pcrfs-root.service.in index 432eb9fd8ce..2fe1ec5008c 100644 --- a/units/systemd-pcrfs-root.service.in +++ b/units/systemd-pcrfs-root.service.in @@ -21,4 +21,4 @@ ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-4 [Service] Type=oneshot RemainAfterExit=yes -ExecStart={{ROOTLIBEXECDIR}}/systemd-pcrphase --file-system=/ +ExecStart={{ROOTLIBEXECDIR}}/systemd-pcrphase --graceful --file-system=/ diff --git a/units/systemd-pcrfs@.service.in b/units/systemd-pcrfs@.service.in index 6bbd4b72a53..6cf39eb9a7e 100644 --- a/units/systemd-pcrfs@.service.in +++ b/units/systemd-pcrfs@.service.in @@ -22,4 +22,4 @@ ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-4 [Service] Type=oneshot RemainAfterExit=yes -ExecStart={{ROOTLIBEXECDIR}}/systemd-pcrphase --file-system=%f +ExecStart={{ROOTLIBEXECDIR}}/systemd-pcrphase --graceful --file-system=%f diff --git a/units/systemd-pcrmachine.service.in b/units/systemd-pcrmachine.service.in index f1c6ce9f265..8c942c3b55e 100644 --- a/units/systemd-pcrmachine.service.in +++ b/units/systemd-pcrmachine.service.in @@ -20,4 +20,4 @@ ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-4 [Service] Type=oneshot RemainAfterExit=yes -ExecStart={{ROOTLIBEXECDIR}}/systemd-pcrphase --machine-id +ExecStart={{ROOTLIBEXECDIR}}/systemd-pcrphase --graceful --machine-id