nebd: fix jemalloc dependecy and shared library path

opencurve · Jan 29, 2021 · d863271 · d863271
1 parent c674697
commit d863271
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/curve-ansible/roles/install_package/templates/nebd-daemon.j2 b/curve-ansible/roles/install_package/templates/nebd-daemon.j2
@@ -103,11 +103,11 @@ function start() {
         exit 1
     fi
 
-    jemallocpath={{ jemalloc_path }}
     # 检查jemalloc库文件
-    if [ ! -f ${jemallocpath} ]
+    jemallocpath=`find /usr/ -name "libjemalloc.so*" -print -quit`
+    if [ "${jemallocpath}" = "" ]
     then
-        echo "Not found jemalloc library, Path is ${jemallocpath}"
+        echo "Not found jemalloc library in /usr/"
         exit 1
     fi
 

diff --git a/nebd/nebd-package/DEBIAN/control b/nebd/nebd-package/DEBIAN/control
@@ -1,7 +1,7 @@
 Package: nebd
 Section:
 Priority: optional
-Depends: libunwind8, libjemalloc1(= 3.6.0-9.1)
+Depends: libunwind8, libjemalloc1(= 3.6.0-9.1) | libjemalloc2(>= 5.1.0-3)
 Suggests:
 Architecture:amd64
 Installed-Size:

diff --git a/nebd/nebd-package/usr/bin/nebd-daemon b/nebd/nebd-package/usr/bin/nebd-daemon
@@ -103,11 +103,11 @@ function start() {
         exit 1
     fi
 
-    jemallocpath=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1
     # 检查jemalloc库文件
-    if [ ! -f ${jemallocpath} ]
+    jemallocpath=`find /usr/ -name "libjemalloc.so*" -print -quit`
+    if [ "${jemallocpath}" = "" ]
     then
-        echo "Not found jemalloc library, Path is ${jemallocpath}"
+        echo "Not found jemalloc library in /usr/"
         exit 1
     fi