From 339ed7dfb9a1071db535cecc1497d4c0877f56f8 Mon Sep 17 00:00:00 2001 From: Sergio Arroutbi Date: Tue, 2 Aug 2022 09:47:29 -0300 Subject: [PATCH] Start clevis-luks-askpass.path from preset Start clevis-luks-askpass.path service according to global policy defined in systemd presets Resolves: rhbz#2107078 --- clevis.spec | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/clevis.spec b/clevis.spec index e03c234..1fa483b 100644 --- a/clevis.spec +++ b/clevis.spec @@ -1,6 +1,6 @@ Name: clevis Version: 18 -Release: 104%{?dist} +Release: 105%{?dist} Summary: Automated decryption framework License: GPLv3+ @@ -50,6 +50,7 @@ Requires: jose >= 8 Requires: curl Requires: jq Requires(pre): shadow-utils +Requires(post): systemd Recommends: cracklib-dicts %description @@ -134,16 +135,8 @@ if getent group tss >/dev/null && ! groups %{name} | grep -q "\btss\b"; then fi exit 0 -%posttrans -# In case the clevis-luks-askpass is enabled, make sure it's using the -# correct target, which changed in v14. -[ "$(find /etc/systemd/system/ -name "clevis-luks-askpass*")" ] || exit 0 -find /etc/systemd/system/ -name "clevis-luks-askpass*" \ - | grep -q cryptsetup.target.wants && exit 0 - -find /etc/systemd/system/ -name "clevis-luks-askpass*" -exec rm {} + -systemctl enable clevis-luks-askpass.path >/dev/null 2>&1 || : -exit 0 +%post systemd +systemctl preset %{name}-luks-askpass.path >/dev/null 2>&1 || : %files %license COPYING @@ -202,6 +195,10 @@ exit 0 %attr(4755, root, root) %{_libexecdir}/%{name}-luks-udisks2 %changelog +* Tue Aug 02 2022 Sergio Arroutbi - 18-105 +- Start clevis-luks-askpass.path service according to global policy + Resolves: rhbz#2107078 + * Thu Jul 21 2022 Sergio Arroutbi - 18-104 - Improve boot performance by removing key check Resolves: rhbz#2099701