summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarshavardhana <harsha@zresearch.com>2009-05-15 02:39:15 -0700
committerAnand V. Avati <avati@amp.gluster.com>2009-05-16 15:32:44 +0530
commitce653eadc2d13e9f4d3748d217ef7614539a2f34 (patch)
treebcf600c879ca15a32d465b83d6814f8e6f891352
parent11cae446e0c115bbfa5ee3e6b18ef0e2c45b84fe (diff)
modified init scripts to honour @prefix@
fixes http://savannah.nongnu.org/bugs/?26581 Signed-off-by: Anand V. Avati <avati@amp.gluster.com>
-rw-r--r--configure.ac3
-rwxr-xr-xextras/init.d/glusterfsd-Debian.in (renamed from extras/init.d/glusterfsd-Debian)2
-rwxr-xr-xextras/init.d/glusterfsd-Redhat.in (renamed from extras/init.d/glusterfsd-Redhat)5
-rwxr-xr-xextras/init.d/glusterfsd-SuSE.in (renamed from extras/init.d/glusterfsd-SuSE)5
4 files changed, 12 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index aee4dd07e86..5e44081c0aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,6 +125,9 @@ AC_CONFIG_FILES([Makefile
extras/Makefile
extras/init.d/Makefile
extras/init.d/glusterfs-server.plist
+ extras/init.d/glusterfsd-Debian
+ extras/init.d/glusterfsd-Redhat
+ extras/init.d/glusterfsd-SuSE
extras/benchmarking/Makefile
glusterfs.spec])
diff --git a/extras/init.d/glusterfsd-Debian b/extras/init.d/glusterfsd-Debian.in
index dcd3e0c50f1..a0c83d53569 100755
--- a/extras/init.d/glusterfsd-Debian
+++ b/extras/init.d/glusterfsd-Debian.in
@@ -15,7 +15,7 @@
PATH=/sbin:/usr/sbin:/bin:/usr/bin
NAME=glusterfsd
SCRIPTNAME=/etc/init.d/$NAME
-DAEMON=/usr/sbin/$NAME
+DAEMON=@prefix@/sbin/$NAME
PIDFILE=/var/run/$NAME.pid
CONFIGFILE=/etc/glusterfs/glusterfsd.vol
GLUSTERFS_OPTS="-f $CONFIGFILE"
diff --git a/extras/init.d/glusterfsd-Redhat b/extras/init.d/glusterfsd-Redhat.in
index 2577e9e7647..f53de8f2190 100755
--- a/extras/init.d/glusterfsd-Redhat
+++ b/extras/init.d/glusterfsd-Redhat.in
@@ -8,7 +8,10 @@
. /etc/rc.d/init.d/functions
BASE=glusterfsd
-GSERVER="/usr/sbin/$BASE -f /etc/glusterfs/glusterfsd.vol"
+GLUSTERFSD_BIN=@prefix@/sbin/$BASE
+CONFIGFILE=/etc/glusterfs/glusterfsd.vol
+GLUSTERFSD_OPTS="-f $CONFIGFILE"
+GSERVER="$GLUSTERFSD_BIN $GLUSTERFSD_OPTS"
RETVAL=0
# Start the service $BASE
diff --git a/extras/init.d/glusterfsd-SuSE b/extras/init.d/glusterfsd-SuSE.in
index ede27b2b3c8..43552bb499c 100755
--- a/extras/init.d/glusterfsd-SuSE
+++ b/extras/init.d/glusterfsd-SuSE.in
@@ -15,7 +15,10 @@
. /etc/rc.status
BASE=glusterfsd
-GSERVER="/usr/sbin/$BASE -f /etc/glusterfs/glusterfsd.vol"
+GLUSTERFSD_BIN=@prefix@/sbin/$BASE
+CONFIGFILE=/etc/glusterfs/glusterfsd.vol
+GLUSTERFSD_OPTS="-f $CONFIGFILE"
+GSERVER="$GLUSTERFSD_BIN $GLUSTERFSD_OPTS"
RETVAL=0
# Start the service $BASE