[audit] Enable by default (#737060)
Steve Grubb
sgrubb at fedoraproject.org
Wed Sep 14 23:32:03 UTC 2011
commit 33ec4fcb4426c6bc9514c57cd2a2596d2793eea1
Author: Steve <sgrubb at redhat.com>
Date: Wed Sep 14 19:31:33 2011 -0400
Enable by default (#737060)
audit.spec | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/audit.spec b/audit.spec
index ff95ab6..aab214c 100644
--- a/audit.spec
+++ b/audit.spec
@@ -3,7 +3,7 @@
Summary: User space tools for 2.6 kernel auditing
Name: audit
Version: 2.1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Daemons
URL: http://people.redhat.com/sgrubb/audit/
@@ -144,22 +144,25 @@ rm -rf $RPM_BUILD_ROOT
%post libs -p /sbin/ldconfig
%post
-if [ $1 -eq 1 ] ; then
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -eq 1 ] ; then
+ # Initial installation
+ /bin/systemctl enable auditd.service >/dev/null 2>&1 || :
fi
%preun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
- /bin/systemctl try-restart auditd.service >/dev/null 2>&1 || :
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable auditd.service > /dev/null 2>&1 || :
+ /bin/systemctl stop auditd.service > /dev/null 2>&1 || :
fi
%postun libs -p /sbin/ldconfig
%postun
-if [ $1 = 0 ]; then
- /bin/systemctl --no-reload auditd.service > /dev/null 2>&1 || :
- /bin/systemctl stop auditd.service > /dev/null 2>&1 || :
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart auditd.service >/dev/null 2>&1 || :
fi
%triggerun -- audit < 2.1.2-2
@@ -252,6 +255,9 @@ fi
%attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz
%changelog
+* Wed Sep 14 2011 Steve Grubb <sgrubb at redhat.com> 2.1.3-3
+- Enable by default (#737060)
+
* Tue Aug 30 2011 Steve Grubb <sgrubb at redhat.com> 2.1.3-2
- Correct misplaced %ifnarch (#734359)
More information about the scm-commits
mailing list