From 830219b46364979d5a30046262c951330bea5bbf Mon Sep 17 00:00:00 2001 From: Jinkun Jang Date: Sat, 16 Mar 2013 01:08:42 +0900 Subject: [PATCH] merge with master --- packaging/corewatcher | 3 --- packaging/corewatcher.spec | 7 +------ src/corewatcher.service.in | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 packaging/corewatcher diff --git a/packaging/corewatcher b/packaging/corewatcher deleted file mode 100644 index b486538..0000000 --- a/packaging/corewatcher +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/usr/sbin/corewatcher & \ No newline at end of file diff --git a/packaging/corewatcher.spec b/packaging/corewatcher.spec index e7f4206..6ab6a21 100644 --- a/packaging/corewatcher.spec +++ b/packaging/corewatcher.spec @@ -43,10 +43,6 @@ 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 @@ -57,5 +53,4 @@ ln -s ../corewatcher.service %{buildroot}%{_libdir}/systemd/system/multi-user.ta %{_sysconfdir}/rc.d/init.d/corewatcher %{_sysconfdir}/rc.d/rc3.d/S10corewatcher %{_sysconfdir}/rc.d/rc4.d/S10corewatcher -%{_libdir}/systemd/system/corewatcher.service -%{_libdir}/systemd/system/multi-user.target.wants/corewatcher.service +%exclude %{_libdir}/systemd/system/corewatcher.service diff --git a/src/corewatcher.service.in b/src/corewatcher.service.in index 0182ba4..a261532 100644 --- a/src/corewatcher.service.in +++ b/src/corewatcher.service.in @@ -5,7 +5,7 @@ After=sysinit.target [Service] Type=forking -ExecStart=@prefix@/sbin/corewatcher +ExecStart=@prefix@/bin/corewatcher [Install] WantedBy=multi-user.target -- 2.7.4