From: Sage Weil <sage@newdream.net>
Date: Wed, 15 Jul 2009 21:06:39 +0000 (-0700)
Subject: initscripts: /etc, not /usr/etc
X-Git-Tag: v0.10~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6b3309a87c538e61b9bb593e26fd5388c8fac787;p=ceph.git

initscripts: /etc, not /usr/etc
---

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 63ee50ba21f..0315c835538 100644
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -20,7 +20,12 @@ if [ `dirname $0` = "." ] && [ $PWD != "/etc/init.d" ]; then
 else
     BINDIR=@bindir@
     LIBDIR=@libdir@/ceph
-    ETCDIR=@sysconfdir@/ceph
+    # i hate autoconf:
+    if [ "@sysconfdir@" = "/usr/etc" ]; then
+	ETCDIR=/etc/ceph
+    else
+	ETCDIR=@sysconfdir@
+    fi
 fi
 
 usage_exit() {
diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index f9abb2022ec..1e91d188922 100644
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -9,7 +9,12 @@ if [ `dirname $0` = "." ] && [ $PWD != "/etc/init.d" ]; then
 else
     BINDIR=@bindir@
     LIBDIR=@libdir@/ceph
-    ETCDIR=@sysconfdir@/ceph
+    # i hate autoconf:
+    if [ "@sysconfdir@" = "/usr/etc" ]; then
+	ETCDIR=/etc/ceph
+    else
+	ETCDIR=@sysconfdir@
+    fi
 fi
 
 usage_exit() {