From 1d76bbc641b226ffe903153b9c3f161ce88c51a0 Mon Sep 17 00:00:00 2001
From: spiritlhl <103393591+spiritLHLS@users.noreply.github.com>
Date: Wed, 2 Aug 2023 03:14:52 +0000
Subject: [PATCH] 2023.08.02

---
 scripts/buildvm.sh           | 7 +++++++
 scripts/buildvm_extraip.sh   | 7 +++++++
 scripts/buildvm_manual_ip.sh | 7 +++++++
 3 files changed, 21 insertions(+)

diff --git a/scripts/buildvm.sh b/scripts/buildvm.sh
index 9b3b08b..6b386ec 100644
--- a/scripts/buildvm.sh
+++ b/scripts/buildvm.sh
@@ -221,6 +221,13 @@ qm set $vm_num --ipconfig0 ip=${user_ip}/24,gw=172.16.1.1
 qm set $vm_num --cipassword $password --ciuser $user
 # qm set $vm_num --agent 1
 qm resize $vm_num scsi0 ${disk}G
+if [ $? -ne 0 ]; then
+    if [[ $disk =~ ^[0-9]+G$ ]]; then
+        dnum=${disk::-1}
+        disk_m=$((dnum * 1024))
+        qm resize $vm_num scsi0 ${disk_m}M
+    fi
+fi
 qm start $vm_num
 
 iptables -t nat -A PREROUTING -p tcp --dport ${sshn} -j DNAT --to-destination ${user_ip}:22
diff --git a/scripts/buildvm_extraip.sh b/scripts/buildvm_extraip.sh
index 986e846..4694bb5 100644
--- a/scripts/buildvm_extraip.sh
+++ b/scripts/buildvm_extraip.sh
@@ -279,6 +279,13 @@ qm set $vm_num --ipconfig0 ip=${user_ip}/${user_ip_range},gw=${gateway}
 qm set $vm_num --cipassword $password --ciuser $user
 # qm set $vm_num --agent 1
 qm resize $vm_num scsi0 ${disk}G
+if [ $? -ne 0 ]; then
+    if [[ $disk =~ ^[0-9]+G$ ]]; then
+        dnum=${disk::-1}
+        disk_m=$((dnum * 1024))
+        qm resize $vm_num scsi0 ${disk_m}M
+    fi
+fi
 qm start $vm_num
 
 echo "$vm_num $user $password $core $memory $disk $system $storage $user_ip" >> "vm${vm_num}"
diff --git a/scripts/buildvm_manual_ip.sh b/scripts/buildvm_manual_ip.sh
index 0d92560..f9f34ad 100644
--- a/scripts/buildvm_manual_ip.sh
+++ b/scripts/buildvm_manual_ip.sh
@@ -282,6 +282,13 @@ qm set $vm_num --ipconfig0 ip=${user_ip}/${user_ip_range},gw=${gateway}
 qm set $vm_num --cipassword $password --ciuser $user
 # qm set $vm_num --agent 1
 qm resize $vm_num scsi0 ${disk}G
+if [ $? -ne 0 ]; then
+    if [[ $disk =~ ^[0-9]+G$ ]]; then
+        dnum=${disk::-1}
+        disk_m=$((dnum * 1024))
+        qm resize $vm_num scsi0 ${disk_m}M
+    fi
+fi
 qm start $vm_num
 
 echo "$vm_num $user $password $core $memory $disk $system $storage $user_ip" >> "vm${vm_num}"