Merge pull request #59 from peng9808/test

fix deb bug
hwameistor · Jan 23, 2024 · b719fbd · b719fbd
2 parents 42fc341 + 4539b6b
commit b719fbd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/docker-drbd9/entry.sh b/docker-drbd9/entry.sh
@@ -279,9 +279,11 @@ else
     if [[ -n "$drbd_deb"  && -n "$utils_deb" ]]; then
       cp $drbd_deb /pkgs_root/drbd.deb
       cp $utils_deb /pkgs_root/drbd_utils.deb
-      cp $DEBDIR/install_deb.sh /pkgs_root/install_deb.sh
-      nsenter --target 1 --mount --uts --ipc --net --pid chmod +X /root/install_deb.sh
-      nsenter --target 1 --mount --uts --ipc --net --pid ./root/install_deb.sh
+      #cp $DEBDIR/install_deb.sh /pkgs_root/install_deb.sh
+      #nsenter --target 1 --mount --uts --ipc --net --pid chmod +X /root/install_deb.sh
+      #nsenter --target 1 --mount --uts --ipc --net --pid ./root/install_deb.sh
+      nsenter --target 1 --mount --uts --ipc --net --pid apt install -y /root/drbd_utils.deb
+      nsenter --target 1 --mount --uts --ipc --net --pid apt install -y /root/drbd.deb &
       exit_code=$?
       if [ $exit_code -eq 0 ]; then
         nsenter --target 1 --mount --uts --ipc --net --pid  modprobe drbd

diff --git a/docker-shipper/drbd-debs/install_deb.sh b/docker-shipper/drbd-debs/install_deb.sh