[clamav] made script in -scanner-systemd an instance of clamd at .service
ensc
ensc at fedoraproject.org
Sun Jan 8 11:56:44 UTC 2012
commit ff790d3534c0cc92fd533a60e18302ec9d30e51d
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date: Sun Jan 8 11:56:49 2012 +0100
made script in -scanner-systemd an instance of clamd at .service
clamav.spec | 10 ++++++----
clamd.scan.systemd | 12 ------------
clamd at scan.service | 7 +++++++
3 files changed, 13 insertions(+), 16 deletions(-)
---
diff --git a/clamav.spec b/clamav.spec
index 283b1d1..bf54649 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -209,9 +209,10 @@ Requires(preun): /sbin/initctl
%package scanner-systemd
Summary: Systemd initscripts for clamav scanner daemon
Group: System Environment/Daemons
-Source430: clamd.scan.systemd
+Source430: clamd at scan.service
Provides: init(clamav-scanner) = systemd
Requires: clamav-scanner = %version-%release
+Requires: clamav-server-systemd = %version-%release
%{?systemd_reqs}
%{?noarch}
@@ -530,7 +531,7 @@ sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \
> $RPM_BUILD_ROOT%_initrddir/clamd.scan
install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf
-install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd.scan.service
+install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd at scan.service
cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamd.scan.conf
d %scanstatedir 0710 %scanuser %scanuser
@@ -630,7 +631,7 @@ test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || :
test "$1" != "0" || /sbin/initctl -q stop clamd.scan || :
-%systemd_install scanner-systemd clamd.scan.service
+%systemd_install scanner-systemd clamd at scan.service
%post update
@@ -808,7 +809,7 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || :
%if 0%{?with_systemd:1}
%files scanner-systemd
%defattr(-,root,root,-)
- %_unitdir/clamd.scan.service
+ %_unitdir/clamd at scan.service
%endif
## -----------------------
@@ -854,6 +855,7 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || :
- set correct SELinux context for logfiles generated in %%post (#754555)
- create systemd tmpfiles in %%post
- created -server-systemd subpackage providing a clamd at .service template
+- made script in -scanner-systemd an instance of clamd at .service
* Tue Oct 18 2011 Nick Bebout <nb at fedoraproject.org> - 0.97.3-1700
- updated to 0.97.3
diff --git a/clamd at scan.service b/clamd at scan.service
new file mode 100644
index 0000000..c329612
--- /dev/null
+++ b/clamd at scan.service
@@ -0,0 +1,7 @@
+.include /lib/systemd/system/clamd at .service
+
+[Unit]
+Description = Generic clamav scanner daemon
+
+[Install]
+WantedBy = multi-user.target
More information about the scm-commits
mailing list