Use explicit versioning instead of wildcard for ESX(i) 7.0.x

lamw · Oct 20, 2021 · 9e5e79c · 9e5e79c
1 parent 58e7576
commit 9e5e79c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/ghettoVCB-restore.sh b/ghettoVCB-restore.sh
@@ -93,11 +93,11 @@ sanityCheck() {
     ESX_VERSION=$(vmware -v | awk '{print $3}')
 
     case "${ESX_VERSION}" in
-        7.0.*)                VER=7; break;;
-        6.0.0|6.5.0|6.7.0)    VER=6; break;;
-        5.0.0|5.1.0|5.5.0)    VER=5; break;;
-        4.0.0|4.1.0)          VER=4; break;;
-        3.5.0|3i)             VER=3; break;;
+        7.0.0|7.0.1|7.0.2|7.0.3)    VER=7; break;;
+        6.0.0|6.5.0|6.7.0)          VER=6; break;;
+        5.0.0|5.1.0|5.5.0)          VER=5; break;;
+        4.0.0|4.1.0)                VER=4; break;;
+        3.5.0|3i)                   VER=3; break;;
         *)              echo "ESX(i) version not supported!"; exit 1; break;;
     esac
 

diff --git a/ghettoVCB.sh b/ghettoVCB.sh
@@ -308,11 +308,11 @@ sanityCheck() {
     ESX_RELEASE=$(uname -r)
 
     case "${ESX_VERSION}" in
-        7.0.*)                VER=7; break;;
-        6.0.0|6.5.0|6.7.0)    VER=6; break;;
-        5.0.0|5.1.0|5.5.0)    VER=5; break;;
-        4.0.0|4.1.0)          VER=4; break;;
-        3.5.0|3i)             VER=3; break;;
+        7.0.0|7.0.1|7.0.2|7.0.3)    VER=7; break;;
+        6.0.0|6.5.0|6.7.0)          VER=6; break;;
+        5.0.0|5.1.0|5.5.0)          VER=5; break;;
+        4.0.0|4.1.0)                VER=4; break;;
+        3.5.0|3i)                   VER=3; break;;
         *)              echo "ESX(i) version not supported!"; exit 1; break;;
     esac
 
@@ -903,7 +903,7 @@ ghettoVCB() {
             #1 = readonly
             #0 = readwrite
             logger "debug" "Mounting NFS: ${NFS_SERVER}:${NFS_MOUNT} to /vmfs/volume/${NFS_LOCAL_NAME}"
-	    if [[ ${ESX_RELEASE} == "5.5.0" || ${ESX_RELEASE} == "6.0.0" || ${ESX_RELEASE} == "6.5.0" || ${ESX_RELEASE} == "6.7.0" || ${ESX_RELEASE} =~ "^7\.0\." ]] ; then
+	    if [[ ${ESX_RELEASE} == "5.5.0" ]] || [[ ${ESX_RELEASE} == "6.0.0" || ${ESX_RELEASE} == "6.5.0" || ${ESX_RELEASE} == "6.7.0" || ${ESX_RELEASE} == "7.0.0" || ${ESX_RELEASE} == "7.0.1" || ${ESX_RELEASE} == "7.0.2" || ${ESX_RELEASE} == "7.0.3" ]] ; then
                 ${VMWARE_CMD} hostsvc/datastore/nas_create "${NFS_LOCAL_NAME}" "${NFS_VERSION}" "${NFS_MOUNT}" 0 "${NFS_SERVER}"
             else
                 ${VMWARE_CMD} hostsvc/datastore/nas_create "${NFS_LOCAL_NAME}" "${NFS_SERVER}" "${NFS_MOUNT}" 0