From 2a57a0766d4682eaf2bb31d0da98ef1c6c7859b5 Mon Sep 17 00:00:00 2001
From: JDierkse <j.dierkse@madeo.nl>
Date: Fri, 25 Nov 2022 12:51:51 +0000
Subject: [PATCH] Update mount scripts

---
 initializeVolume => mountVolume           | 17 +++++++++--------
 cleanupInitializedVolume => unmountVolume |  0
 2 files changed, 9 insertions(+), 8 deletions(-)
 rename initializeVolume => mountVolume (72%)
 rename cleanupInitializedVolume => unmountVolume (100%)

diff --git a/initializeVolume b/mountVolume
similarity index 72%
rename from initializeVolume
rename to mountVolume
index 370a0b4..34c1c3d 100755
--- a/initializeVolume
+++ b/mountVolume
@@ -18,15 +18,16 @@ sleep 0.5
 SESSIONID=$(iscsiadm -m session | grep "${IQN}" | head -n 1 | sed -e 's/.*\[\(.*\)\].*/\1/g')
 DEVICE=$(iscsiadm -m session -r ${SESSIONID} -P 3 | grep "Attached scsi disk" | sed -e 's/.*Attached scsi disk \([^\t]*\).*/\/dev\/\1/g')
 
+mkdir -p /mnt/iSCSI_${IQN}
+
 FILESYSTEM=$(blkid ${DEVICE})
 if [ -z "${FILESYSTEM}" ]; then
-	mkfs.ext4 ${DEVICE}
+	echo "No Filesystem found, initialize using following command:"
+	echo "mkfs.ext4 ${DEVICE}"
+	echo ""
+	echo "And mount afterwards using:"
+	echo "mount ${DEVICE} /mnt/iSCSI_${IQN}"
+else
+	mount ${DEVICE} /mnt/iSCSI_${IQN}
 fi
 
-mkdir -p /mnt/iSCSI_${IQN}
-mount ${DEVICE} /mnt/iSCSI_${IQN}
-
-#umount /mnt/iSCSI_${IQN}
-#rm -rf /mnt/iSCSI_${IQN}
-#iscsiadm -m node -T ${IQN} -p ${HOST} -u
-
diff --git a/cleanupInitializedVolume b/unmountVolume
similarity index 100%
rename from cleanupInitializedVolume
rename to unmountVolume