---
CMakeLists.txt | 7 +++++
matahari.init | 74 ------------------------------------------------------
matahari.init.in | 6 ++--
3 files changed, 10 insertions(+), 77 deletions(-)
delete mode 100644 matahari.init
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45d774c..623704f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,3 +14,10 @@ include (CheckIncludeFiles)
check_include_files (string.h HAVE_STRING_H)
check_include_files (sys/ioctl.h HAVE_SYS_IOCTL_H)
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
${CMAKE_CURRENT_BINARY_DIR}/src/config.h)
+
+# Set some prefixes
+set(localstatedir "/var")
+set(sysconfdir "/etc")
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/matahari.init.in
+ ${CMAKE_CURRENT_BINARY_DIR}/matahari.init)
+
diff --git a/matahari.init b/matahari.init
deleted file mode 100644
index cc73572..0000000
--- a/matahari.init
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-
-# the following is chkconfig init header
-# matahari: host qmf agent
-# chkconfig: - 99 01
-# description: This is a daemon acts as a host qmf agent
-# processname: matahari-host
-# pidfile: /var/run/matahari.pid
-#
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-SERVICE=`basename "$0"`
-PROCESS=`echo $SERVICE | tr '-' '_'`
-RETVAL=0
-
-[ -f /etc/sysconfig/$SERVICE ] && . /etc/sysconfig/$SERVICE
-
-start() {
- echo -n $"Starting $SERVICE daemon: "
- daemon $PROCESS $MATAHARI_ARGS
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE
-}
-
-stop() {
- echo -n $"Stopping $SERVICE daemon: "
-
- killproc $PROCESS
- RETVAL=$?
- echo
- if [ $RETVAL -eq 0 ]; then
- rm -f /var/lock/subsys/$SERVICE
- rm -f /var/run/$SERVICE.pid
- fi
-}
-
-restart() {
- stop
- start
-}
-
-reload() {
- echo -n $"Reloading $SERVICE configuration: "
-
- killproc $PROCESS -HUP
- RETVAL=$?
- echo
- return $RETVAL
-}
-
-# See how we were called.
-case "$1" in
- start|stop|restart|reload)
- $1
- ;;
- status)
- status $PROCESS
- RETVAL=$?
- ;;
- force-reload)
- reload
- ;;
- condrestart|try-restart)
- [ -f /var/lock/subsys/$SERVICE ] && restart || :
- ;;
- *)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
- exit 1
- ;;
-esac
-exit $RETVAL
diff --git a/matahari.init.in b/matahari.init.in
index 1f6be49..1223416 100644
--- a/matahari.init.in
+++ b/matahari.init.in
@@ -11,8 +11,8 @@
# Source function library.
. @sysconfdir(a)/rc.d/init.d/functions
-SERVICE=matahari
-PROCESS=matahari
+SERVICE=`basename "$0"`
+PROCESS=`echo $SERVICE | tr '-' '_'`
RETVAL=0
@@ -23,7 +23,7 @@ start() {
daemon $PROCESS $MATAHARI_ARGS --daemon
RETVAL=$?
echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE
+ [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE
}
stop() {
--
1.7.2.3
Show replies by date