From 5ee7fd0d99840af69136ba255909cd9cbb150c09707b0f3e66f1008e2017d5cc Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Mon, 19 Aug 2019 10:35:23 +0000 Subject: [PATCH] Accepting request 724522 from home:kukuk:branches:security:apparmor - Don't assume systemctl is already installed or available at all. - Files in /usr/lib/rpm/macros.d are no config files OBS-URL: https://build.opensuse.org/request/show/724522 OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor-rpm-macros?expand=0&rev=11 --- apparmor-rpm-macros.changes | 6 ++++++ apparmor-rpm-macros.spec | 2 +- macros.apparmor | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apparmor-rpm-macros.changes b/apparmor-rpm-macros.changes index daffe94..708e8f0 100644 --- a/apparmor-rpm-macros.changes +++ b/apparmor-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 19 11:08:48 CEST 2019 - kukuk@suse.de + +- Don't assume systemctl is already installed or available at all. +- Files in /usr/lib/rpm/macros.d are no config files + ------------------------------------------------------------------- Wed May 8 16:53:08 UTC 2019 - Christian Boltz diff --git a/apparmor-rpm-macros.spec b/apparmor-rpm-macros.spec index f2857d6..feee625 100644 --- a/apparmor-rpm-macros.spec +++ b/apparmor-rpm-macros.spec @@ -43,6 +43,6 @@ install -m644 %{S:0} %{buildroot}%{macrodir}/ %files %defattr(-,root,root) -%config %{macrodir}/macros.apparmor +%{macrodir}/macros.apparmor %changelog diff --git a/macros.apparmor b/macros.apparmor index 4916e0d..5d91709 100644 --- a/macros.apparmor +++ b/macros.apparmor @@ -1,5 +1,5 @@ %apparmor_reload()\ - if [ "$YAST_IS_RUNNING" != "instsys" ]; then\ + if [ "$YAST_IS_RUNNING" != "instsys" -a -x /usr/bin/systemctl ]; then\ if /usr/bin/systemctl is-active --quiet apparmor.service; then\ /sbin/apparmor_parser -r -T -W %{?*} &> /dev/null || :\ fi\