sync with master

diff --git a/packaging/corewatcher.spec b/packaging/corewatcher.spec
index 6ab6a21..e7f4206 100644 (file)
--- a/packaging/corewatcher.spec
+++ b/packaging/corewatcher.spec
@@ -43,6 +43,10 @@ install -m0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/corewatcher
 ln -s ../init.d/corewatcher %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S10corewatcher
 ln -s ../init.d/corewatcher %{buildroot}%{_sysconfdir}/rc.d/rc4.d/S10corewatcher
 
+mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
+install -m 0644 corewatcher.service %{buildroot}%{_libdir}/systemd/system/corewatcher.service
+ln -s ../corewatcher.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/corewatcher.service
+
 %files
 %defattr(-,root,root,-)
 %config(noreplace) /etc/corewatcher/corewatcher.conf
@@ -53,4 +57,5 @@ ln -s ../init.d/corewatcher %{buildroot}%{_sysconfdir}/rc.d/rc4.d/S10corewatcher
 %{_sysconfdir}/rc.d/init.d/corewatcher
 %{_sysconfdir}/rc.d/rc3.d/S10corewatcher
 %{_sysconfdir}/rc.d/rc4.d/S10corewatcher
-%exclude %{_libdir}/systemd/system/corewatcher.service
+%{_libdir}/systemd/system/corewatcher.service
+%{_libdir}/systemd/system/multi-user.target.wants/corewatcher.service

diff --git a/src/corewatcher.service.in b/src/corewatcher.service.in
index a261532..0182ba4 100644 (file)
--- a/src/corewatcher.service.in
+++ b/src/corewatcher.service.in
@@ -5,7 +5,7 @@ After=sysinit.target
 
 [Service]
 Type=forking
-ExecStart=@prefix@/bin/corewatcher
+ExecStart=@prefix@/sbin/corewatcher
 
 [Install]
 WantedBy=multi-user.target