shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-05 13:18:06 +03:00
Code

units: change assert to condition to skip running in initrd/os

Browse Source 
These units are also present in the initrd, so instead of an assert,
just use a condition so they are skipped where they need to be skipped.

Fixes https://github.com/systemd/systemd/issues/26358
This commit is contained in:
Luca Boccassi 2023-02-08 23:06:27 +00:00 committed by Luca Boccassi
parent 3b42ffe590
commit 7ef09e2099
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
units/systemd-pcrfs-root.service.in
View File

@ -14,7 +14,7 @@ DefaultDependencies=no
Conflicts=shutdown.target Conflicts=shutdown.target
After=systemd-pcrmachine.service After=systemd-pcrmachine.service
Before=shutdown.target Before=shutdown.target
AssertPathExists=!/etc/initrd-release ConditionPathExists=!/etc/initrd-release
ConditionSecurity=tpm2 ConditionSecurity=tpm2
ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f

2
units/systemd-pcrfs@.service.in
View File

@ -15,7 +15,7 @@ BindsTo=%i.mount
Conflicts=shutdown.target Conflicts=shutdown.target
After=%i.mount systemd-pcrfs-root.service After=%i.mount systemd-pcrfs-root.service
Before=shutdown.target Before=shutdown.target
AssertPathExists=!/etc/initrd-release ConditionPathExists=!/etc/initrd-release
ConditionSecurity=tpm2 ConditionSecurity=tpm2
ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f

2
units/systemd-pcrmachine.service.in
View File

@ -13,7 +13,7 @@ Documentation=man:systemd-pcrmachine.service(8)
DefaultDependencies=no DefaultDependencies=no
Conflicts=shutdown.target Conflicts=shutdown.target
Before=sysinit.target shutdown.target Before=sysinit.target shutdown.target
AssertPathExists=!/etc/initrd-release ConditionPathExists=!/etc/initrd-release
ConditionSecurity=tpm2 ConditionSecurity=tpm2
ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f

2
units/systemd-pcrphase-initrd.service.in
View File

@ -13,7 +13,7 @@ Documentation=man:systemd-pcrphase-initrd.service(8)
DefaultDependencies=no DefaultDependencies=no
Conflicts=shutdown.target initrd-switch-root.target Conflicts=shutdown.target initrd-switch-root.target
Before=sysinit.target cryptsetup-pre.target cryptsetup.target shutdown.target initrd-switch-root.target systemd-sysext.service Before=sysinit.target cryptsetup-pre.target cryptsetup.target shutdown.target initrd-switch-root.target systemd-sysext.service
AssertPathExists=/etc/initrd-release ConditionPathExists=/etc/initrd-release
ConditionSecurity=tpm2 ConditionSecurity=tpm2
ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f

2
units/systemd-pcrphase-sysinit.service.in
View File

@ -14,7 +14,7 @@ DefaultDependencies=no
Conflicts=shutdown.target Conflicts=shutdown.target
After=sysinit.target After=sysinit.target
Before=basic.target shutdown.target Before=basic.target shutdown.target
AssertPathExists=!/etc/initrd-release ConditionPathExists=!/etc/initrd-release
ConditionSecurity=tpm2 ConditionSecurity=tpm2
ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f

2
units/systemd-pcrphase.service.in
View File

@ -12,7 +12,7 @@ Description=TPM2 PCR Barrier (User)
Documentation=man:systemd-pcrphase.service(8) Documentation=man:systemd-pcrphase.service(8)
After=remote-fs.target remote-cryptsetup.target After=remote-fs.target remote-cryptsetup.target
Before=systemd-user-sessions.service Before=systemd-user-sessions.service
AssertPathExists=!/etc/initrd-release ConditionPathExists=!/etc/initrd-release
ConditionSecurity=tpm2 ConditionSecurity=tpm2
ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f