From: Kefu Chai <kchai@redhat.com>
Date: Thu, 8 Feb 2018 11:04:42 +0000 (+0800)
Subject: init-ceph: s/lib.2/lib.$MGR_PYTHON_VERSION_MAJOR/
X-Git-Tag: v13.0.2~257^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8039c46d4932a5b772020e64fee9aa2e0ff8ed23;p=ceph.git

init-ceph: s/lib.2/lib.$MGR_PYTHON_VERSION_MAJOR/

we should not hardwire cython_modules's path to lib.2, it should be
cython_modules/lib.3 if ceph-mgr requires python3.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/init-ceph.in b/src/init-ceph.in
index e8c0ada2b3a1..d13032a16752 100755
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -34,7 +34,7 @@ else
 	ETCDIR=.
 	ASSUME_DEV=1
 	CEPH_LIB=$CEPH_ROOT/build/lib
-	echo "$PYTHONPATH" | grep -q $CEPH_LIB || export PYTHONPATH=$CEPH_LIB/cython_modules/lib.2:$PYTHONPATH
+	echo "$PYTHONPATH" | grep -q $CEPH_LIB || export PYTHONPATH=$CEPH_LIB/cython_modules/lib.@MGR_PYTHON_VERSION_MAJOR@:$PYTHONPATH
 	echo "$LD_LIBRARY_PATH" | grep -q $CEPH_LIB || export LD_LIBRARY_PATH=$CEPH_LIB:$LD_LIBRARY_PATH
 	echo "$DYLD_LIBRARY_PATH" | grep -q $CEPH_LIB || export DYLD_LIBRARY_PATH=$CEPH_LIB:$DYLD_LIBRARY_PATH
     else