From 716df8fdd09dc792c918a0fc3ee1a650bc633734 Mon Sep 17 00:00:00 2001
From: 5cat <cat@heaeven.ist>
Date: Sat, 6 Aug 2022 22:27:49 +0800
Subject: [PATCH] remove iscsiDirHostPathCheckDirectory and replace it with
 iscsiDirHostType

---
 README.md       | 2 +-
 docker/iscsiadm | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/README.md b/README.md
index e2ff7b4..78ea8d3 100644
--- a/README.md
+++ b/README.md
@@ -170,7 +170,7 @@ node:
       - name: ISCSIADM_HOST_PATH
         value: /usr/local/sbin/iscsiadm
     iscsiDirHostPath: /usr/local/etc/iscsi
-    iscsiDirHostPathCheckDirectory: false
+    iscsiDirHostType: ""
 ```
 and continue your democratic installation as usuall with other iscsi drivers.
 
diff --git a/docker/iscsiadm b/docker/iscsiadm
index d1c988e..1642aaa 100755
--- a/docker/iscsiadm
+++ b/docker/iscsiadm
@@ -1,12 +1,7 @@
 #!/bin/bash
 
-set -e
-set -x
-
 iscsiadm_host_strategy=$([ $ISCSIADM_HOST_STRATEGY ] && echo $ISCSIADM_HOST_STRATEGY || echo "chroot")
 iscsiadm_host_path=$( [ $ISCSIADM_HOST_PATH ] && echo $ISCSIADM_HOST_PATH || echo "/sbin/iscsiadm")
-echo "using iscsiadm_host_strategy=$iscsiadm_host_strategy"
-echo "using iscsiadm_host_path=$iscsiadm_host_path"
 
 case $iscsiadm_host_strategy in
     chroot)
@@ -18,14 +13,12 @@ case $iscsiadm_host_strategy in
         # https://github.com/siderolabs/extensions/issues/38#issuecomment-1125403043
         iscsid_pid=$(for proc in /proc/*/cmdline; do grep -q "iscsid -f" <<< $(cat $proc 2>/dev/null | tr "\0" " ") && echo $(basename $(dirname $proc)) && break; done)
         if [ "$iscsid_pid" = "" ]; then
-            echo "could not find the iscsid process"
             exit 1
         fi
         nsenter --mount="/proc/${iscsid_pid}/ns/mnt" --net="/proc/${iscsid_pid}/ns/net" -- $iscsiadm_host_path "${@:1}"
         ;;
 
     *)
-        echo "$iscsiadm_host_strategy is not a valid strategy, choose either 'chroot' or 'nsenter'"
         exit 1
         ;;
 esac