pool/apparmor-rpm-macros
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 724552 from security:apparmor

Browse Source 
- Don't assume systemctl is already installed or available at all.
- Files in /usr/lib/rpm/macros.d are no config files (forwarded request 724522 from kukuk)

OBS-URL: https://build.opensuse.org/request/show/724552
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apparmor-rpm-macros?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2019-08-27 13:21:20 +00:00 committed by Git OBS Bridge
commit ef9a6cc441
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apparmor-rpm-macros.changes
View File

@ -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 <suse-beta@cboltz.de>

2
apparmor-rpm-macros.spec
View File

@ -43,6 +43,6 @@ install -m644 %{S:0} %{buildroot}%{macrodir}/
%files
%defattr(-,root,root)
%config %{macrodir}/macros.apparmor
%{macrodir}/macros.apparmor
%changelog

2
macros.apparmor
View File

@ -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\