ceph: fix the path for service in ceph-disk

[pti/rtp.git] / meta-stx / recipes-extended / ceph / ceph_13.2.2.bb

diff --git a/meta-stx/recipes-extended/ceph/ceph_13.2.2.bb b/meta-stx/recipes-extended/ceph/ceph_13.2.2.bb
index 96b7076..29a97c1 100644 (file)
--- a/meta-stx/recipes-extended/ceph/ceph_13.2.2.bb
+++ b/meta-stx/recipes-extended/ceph/ceph_13.2.2.bb
@@ -82,6 +82,7 @@ SYSTEMD_SERVICE_${PN} = " \
     ceph-mgr.target \
     rbdmap.service \
 "
+SYSTEMD_AUTO_ENABLE = "disable"
 
 OECMAKE_GENERATOR = "Unix Makefiles"
 
@@ -112,6 +113,7 @@ do_configure_prepend () {
 do_install_append () {
     mv ${D}${bindir}/ceph-disk ${D}${sbindir}/ceph-disk
     sed -i -e 's:${WORKDIR}.*python2.7:${bindir}/python:' ${D}${sbindir}/ceph-disk
+    sed -i -e 's:${sbindir}/service:${bindir}/service:' ${D}/${libdir}/python2.7/site-packages/ceph_disk/main.py
     sed -i -e 's:${WORKDIR}.*python2.7:${bindir}/python:' ${D}${bindir}/ceph
     sed -i -e 's:${WORKDIR}.*python2.7:${bindir}/python:' ${D}${bindir}/ceph-detect-init
     find ${D} -name SOURCES.txt | xargs sed -i -e 's:${WORKDIR}::'