Merge pull request #57 from peng9808/test

fix deb bug
hwameistor · Jan 23, 2024 · 42fc341 · 42fc341
2 parents e248bf4 + a16730d
commit 42fc341
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/docker-drbd9/entry.sh b/docker-drbd9/entry.sh
@@ -279,9 +279,9 @@ else
     if [[ -n "$drbd_deb"  && -n "$utils_deb" ]]; then
       cp $drbd_deb /pkgs_root/drbd.deb
       cp $utils_deb /pkgs_root/drbd_utils.deb
-      nsenter --target 1 --mount --uts --ipc --net --pid ls  /root/
-      nsenter --target 1 --mount --uts --ipc --net --pid apt install /root/drbd.deb
-      nsenter --target 1 --mount --uts --ipc --net --pid apt install  /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
       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
@@ -0,0 +1,6 @@
+#!/bin/bash -x
+
+install_cmd="apt install -y /root/drbd.deb"
+Y | $install_cmd
+apt install -y /root/drbd_utils.deb
+