From: Jackie Huang <jackie.huang@windriver.com>
Date: Tue, 8 Sep 2020 11:01:34 +0000 (+0800)
Subject: ceph: fix the path for service in ceph-disk
X-Git-Tag: cherry~19
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=a7e7e69935201c42d74352bccfc2dc44d5078879;p=pti%2Frtp.git

ceph: fix the path for service in ceph-disk

The hardcoded path /usr/sbin/service in ceph-disk is incorrect
for yocto.

Issue-ID: INF-188
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: Ibb52b7b6f40ea2d068516bb258150a4171eaee48
---

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 8c6b076..29a97c1 100644
--- a/meta-stx/recipes-extended/ceph/ceph_13.2.2.bb
+++ b/meta-stx/recipes-extended/ceph/ceph_13.2.2.bb
@@ -113,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}::'