client/rhel/spacewalk-oscap/Makefile.spacewalk-oscap | 5 ++++-
client/rhel/spacewalk-oscap/scap | 1 +
client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 3b5e0137817249a99f60d9ddd15b3ab4602b8a45
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Wed Feb 29 15:40:15 2012 +0100
Send capabilities to server.
diff --git a/client/rhel/spacewalk-oscap/Makefile.spacewalk-oscap
b/client/rhel/spacewalk-oscap/Makefile.spacewalk-oscap
index cbb8d72..0aa0897 100644
--- a/client/rhel/spacewalk-oscap/Makefile.spacewalk-oscap
+++ b/client/rhel/spacewalk-oscap/Makefile.spacewalk-oscap
@@ -4,11 +4,13 @@
ACTIONS = scap
PYFILES = $(addsuffix .py, $(ACTIONS)) $(addsuffix .pyc, $(ACTIONS))
XSLT = xccdf-resume.xslt
+CAPABILITY = scap
OBJECTS = $(PYFILES) $(XSLT)
PREFIX ?=
ACTIONDIR = $(PREFIX)/usr/share/rhn/actions
XSLTDIR = $(PREFIX)/usr/share/openscap/xsl
+CAPSDIR = $(PREFIX)/etc/sysconfig/rhn/clientCaps.d
INSTALL = /usr/bin/install -c
FILE = -m 644
DIR = -m 755 --verbose -d
@@ -20,9 +22,10 @@ all: $(OBJECTS)
python -c "import py_compile; py_compile.compile('$<')"
install: all
- $(INSTALL) $(DIR) $(ACTIONDIR) $(XSLTDIR)
+ $(INSTALL) $(DIR) $(ACTIONDIR) $(XSLTDIR) $(CAPSDIR)
$(INSTALL) $(FILE) $(PYFILES) $(ACTIONDIR)
$(INSTALL) $(FILE) $(XSLT) $(XSLTDIR)
+ $(INSTALL) $(FILE) $(CAPABILITY) $(CAPSDIR)
clean:
@rm -rf *.pyc *~ .*~
diff --git a/client/rhel/spacewalk-oscap/scap b/client/rhel/spacewalk-oscap/scap
new file mode 100644
index 0000000..7a2f96c
--- /dev/null
+++ b/client/rhel/spacewalk-oscap/scap
@@ -0,0 +1 @@
+scap.xccdf_eval(1)=1
diff --git a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
index a65b9dc..df7c204 100644
--- a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
+++ b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
@@ -37,6 +37,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
+%config /etc/sysconfig/rhn/clientCaps.d/scap
%{_datadir}/rhn/actions/scap.*
%{_datadir}/openscap/xsl/xccdf-resume.xslt
Show replies by date