units: move units over to ConditionSecurity=measured-uki

diff --git a/units/systemd-pcrfs-root.service.in b/units/systemd-pcrfs-root.service.in
index d7941fc1f655adea2d75055d2c3284ac886b58af..11dc7471946b866c2f88c3880fc05714a61427c2 100644 (file)
--- a/units/systemd-pcrfs-root.service.in
+++ b/units/systemd-pcrfs-root.service.in
@@ -15,8 +15,7 @@ Conflicts=shutdown.target
 After=systemd-pcrmachine.service
 Before=shutdown.target
 ConditionPathExists=!/etc/initrd-release
-ConditionSecurity=tpm2
-ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f
+ConditionSecurity=measured-uki
 
 [Service]
 Type=oneshot

diff --git a/units/systemd-pcrfs@.service.in b/units/systemd-pcrfs@.service.in
index 9ada988f5bdcbf0d8b5fce926b17946429a5e16b..fbaec4b999ea71c04bcd7e546bd4ca354c05663b 100644 (file)
--- a/units/systemd-pcrfs@.service.in
+++ b/units/systemd-pcrfs@.service.in
@@ -16,8 +16,7 @@ Conflicts=shutdown.target
 After=%i.mount systemd-pcrfs-root.service
 Before=shutdown.target
 ConditionPathExists=!/etc/initrd-release
-ConditionSecurity=tpm2
-ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f
+ConditionSecurity=measured-uki
 
 [Service]
 Type=oneshot

diff --git a/units/systemd-pcrmachine.service.in b/units/systemd-pcrmachine.service.in
index 9088a66acff459454aff69667b26b702d3c2d907..fb7d3ce601fd5c7239d02544347e9843a9164ffb 100644 (file)
--- a/units/systemd-pcrmachine.service.in
+++ b/units/systemd-pcrmachine.service.in
@@ -14,8 +14,7 @@ DefaultDependencies=no
 Conflicts=shutdown.target
 Before=sysinit.target shutdown.target
 ConditionPathExists=!/etc/initrd-release
-ConditionSecurity=tpm2
-ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f
+ConditionSecurity=measured-uki
 
 [Service]
 Type=oneshot

diff --git a/units/systemd-pcrphase-initrd.service.in b/units/systemd-pcrphase-initrd.service.in
index 357c7c58696a4f91dce570f8eef0b61f913196d6..b337d602bad01d592ea1b39da561fc8704b6efe4 100644 (file)
--- a/units/systemd-pcrphase-initrd.service.in
+++ b/units/systemd-pcrphase-initrd.service.in
@@ -14,8 +14,7 @@ DefaultDependencies=no
 Conflicts=shutdown.target initrd-switch-root.target
 Before=sysinit.target cryptsetup-pre.target cryptsetup.target shutdown.target initrd-switch-root.target systemd-sysext.service
 ConditionPathExists=/etc/initrd-release
-ConditionSecurity=tpm2
-ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f
+ConditionSecurity=measured-uki
 
 [Service]
 Type=oneshot

diff --git a/units/systemd-pcrphase-sysinit.service.in b/units/systemd-pcrphase-sysinit.service.in
index 5ca986fdf739543e51a993059b847cd125c7a485..08f73973bee81b5351aa82f1693aa02f415d8661 100644 (file)
--- a/units/systemd-pcrphase-sysinit.service.in
+++ b/units/systemd-pcrphase-sysinit.service.in
@@ -15,8 +15,7 @@ Conflicts=shutdown.target
 After=sysinit.target
 Before=basic.target shutdown.target
 ConditionPathExists=!/etc/initrd-release
-ConditionSecurity=tpm2
-ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f
+ConditionSecurity=measured-uki
 
 [Service]
 Type=oneshot

diff --git a/units/systemd-pcrphase.service.in b/units/systemd-pcrphase.service.in
index 88d41c2c5d52f2513b0194ee55a4000a9c2c149a..c94ad756d40008d284de239091d239ebfcea99b2 100644 (file)
--- a/units/systemd-pcrphase.service.in
+++ b/units/systemd-pcrphase.service.in
@@ -13,8 +13,7 @@ Documentation=man:systemd-pcrphase.service(8)
 After=remote-fs.target remote-cryptsetup.target
 Before=systemd-user-sessions.service
 ConditionPathExists=!/etc/initrd-release
-ConditionSecurity=tpm2
-ConditionPathExists=/sys/firmware/efi/efivars/StubPcrKernelImage-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f
+ConditionSecurity=measured-uki
 
 [Service]
 Type=oneshot