#9 Apply systemd-preset in clevis-systemd postinstall
Merged 2 years ago by scorreia. Opened 2 years ago by sarroutb.
rpms/ sarroutb/clevis clevis_apply_systemd_preset  into  rawhide

file modified
+8 -12
@@ -1,6 +1,6 @@ 

  Name:           clevis

  Version:        18

- Release:        6%{?dist}

+ Release:        7%{?dist}

  Summary:        Automated decryption framework

  

  License:        GPLv3+
@@ -45,6 +45,7 @@ 

  Requires:       curl

  Requires:       jq

  Requires(pre):  shadow-utils

+ Requires(post): systemd

  Recommends:     cracklib-dicts

  Recommends:     clevis-pin-tpm2

  
@@ -130,17 +131,6 @@ 

  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

- 

  %files

  %license COPYING

  %{_datadir}/bash-completion/
@@ -194,7 +184,13 @@ 

  %{_sysconfdir}/xdg/autostart/%{name}-luks-udisks2.desktop

  %attr(4755, root, root) %{_libexecdir}/%{name}-luks-udisks2

  

+ %post systemd

+ systemctl preset %{name}-luks-askpass.path >/dev/null 2>&1 || :

+ 

  %changelog

+ * Tue Jun 28 2022 Sergio Arroutbi <sarroutb@redhat.com> - 18-7

+   Start clevis-luks-askpass.patch service according to global policy

+ 

  * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 18-6

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

  

This change calls "systemd preset" command after
clevis-systemd postinstall, so that it applies
distro global policies after installation, allowing
to start the service when global policies indicate so

Signed-off-by: Sergio Arroutbi sarroutb@redhat.com

rebased onto f121408

2 years ago

rebased onto fb2f34f

2 years ago

Pull-Request has been merged by scorreia

2 years ago
Metadata