initscripts: /etc, not /usr/etc

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 63ee50ba21f4eb86129e6b12b983c75a0d4013d0..0315c835538898e488b643b14f81d34c43923813 100644 (file)
--- 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 f9abb2022ec876d20f856439625cb8602ddcde5d..1e91d18892251b1287a7f675ba7cbf739d84083f 100644 (file)
--- 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() {