Merge pull request #54 from peng9808/test

fix some bug
hwameistor · Jan 22, 2024 · 5c84f61 · 5c84f61
2 parents f4fbd91 + 01caadb
commit 5c84f61
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docker-drbd9/entry.sh b/docker-drbd9/entry.sh
@@ -274,8 +274,8 @@ if [ -n "$drbd_rpm" ]; then
     else debug "There is no corresponding kernel version rpm package or drbd-utils rpm package"
     fi
 else
-    drbd_deb=$(find "$RPMDIR" -type f -name "*$OS_KERNEL*" -print -quit)
-    utils_deb=$(find "$RPMDIR" -type f -name "drbd-utils*" -print -quit)
+    drbd_deb=$(find "$DEBDIR" -type f -name "*$OS_KERNEL*" -print -quit)
+    utils_deb=$(find "$DEBDIR" -type f -name "drbd-utils*" -print -quit)
     if [[ -n "$drbd_rpm"  && -n "$utils_rpm" ]]; then
       cp $drbd_deb /pkgs_root/drbd.deb
       cp $utils_deb /pkgs_root/drbd_utils.deb

diff --git a/docker-shipper/entrypoint.adapter.sh b/docker-shipper/entrypoint.adapter.sh
@@ -92,7 +92,7 @@ if [[ $LB_DROP == yes ]]; then
    cp -vf /pkgs/drbd.modules /etc/sysconfig/modules/
 
    # drop drbd utils and set up conf directories
-   cp -vf /pkgs/utils/* /usr-local-bin/
+   cp -vf /pkgs/utils/* /usr/local/bin/
    cat /pkgs/drbd.conf > /etc/drbd.conf
    cp -vf /pkgs/global_common.conf /etc/drbd.d/