diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-16 18:09:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-16 18:09:49 +0000 |
| commit | 022569715958759a1a5ff2df820865dfc1cafecb (patch) | |
| tree | 69a337167ecc86395624f53ab5cb11faadab411b /units | |
| parent | Releasing progress-linux version 256-2~progress7.99u1. (diff) | |
| download | systemd-022569715958759a1a5ff2df820865dfc1cafecb.tar.xz systemd-022569715958759a1a5ff2df820865dfc1cafecb.zip | |
Merging upstream version 256.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'units')
| -rw-r--r-- | units/systemd-tmpfiles-setup.service | 2 | ||||
| -rw-r--r-- | units/systemd-tpm2-setup-early.service.in | 3 | ||||
| -rw-r--r-- | units/systemd-tpm2-setup.service.in | 3 | ||||
| -rw-r--r-- | units/user/systemd-tmpfiles-setup.service | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/units/systemd-tmpfiles-setup.service b/units/systemd-tmpfiles-setup.service index 6cae328..b92beb7 100644 --- a/units/systemd-tmpfiles-setup.service +++ b/units/systemd-tmpfiles-setup.service @@ -8,7 +8,7 @@ # (at your option) any later version. [Unit] -Description=Create Volatile Files and Directories +Description=Create System Files and Directories Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8) DefaultDependencies=no diff --git a/units/systemd-tpm2-setup-early.service.in b/units/systemd-tpm2-setup-early.service.in index 9982c84..7fdb99b 100644 --- a/units/systemd-tpm2-setup-early.service.in +++ b/units/systemd-tpm2-setup-early.service.in @@ -21,3 +21,6 @@ ConditionPathExists=!/run/systemd/tpm2-srk-public-key.pem Type=oneshot RemainAfterExit=yes ExecStart={{LIBEXECDIR}}/systemd-tpm2-setup --early=yes --graceful + +# The tool returns 76 if the TPM cannot be accessed due to an authorization failure and we can't generate an SRK. +SuccessExitStatus=76 diff --git a/units/systemd-tpm2-setup.service.in b/units/systemd-tpm2-setup.service.in index 0af7292..ac29a76 100644 --- a/units/systemd-tpm2-setup.service.in +++ b/units/systemd-tpm2-setup.service.in @@ -22,3 +22,6 @@ ConditionPathExists=!/etc/initrd-release Type=oneshot RemainAfterExit=yes ExecStart={{LIBEXECDIR}}/systemd-tpm2-setup --graceful + +# The tool returns 76 if the TPM cannot be accessed due to an authorization failure and we can't generate an SRK. +SuccessExitStatus=76 diff --git a/units/user/systemd-tmpfiles-setup.service b/units/user/systemd-tmpfiles-setup.service index 156689e..54e453c 100644 --- a/units/user/systemd-tmpfiles-setup.service +++ b/units/user/systemd-tmpfiles-setup.service @@ -8,7 +8,7 @@ # (at your option) any later version. [Unit] -Description=Create User's Volatile Files and Directories +Description=Create User Files and Directories Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8) DefaultDependencies=no Conflicts=shutdown.target |