From 8a879311af856bd8fafa3ffc5f45e61575a0af99 Mon Sep 17 00:00:00 2001
From: Dmitry Badovsky <dbadovsky@gmail.com>
Date: Sun, 26 Oct 2025 05:52:27 +0000
Subject: [PATCH] Update vmcreate1.sh

---
 vmcreate1.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/vmcreate1.sh b/vmcreate1.sh
index 63b37fa..748f384 100644
--- a/vmcreate1.sh
+++ b/vmcreate1.sh
@@ -157,9 +157,11 @@ mksnippet (){
     if [[ -v $username ]];
         then sed -i "s|user: root|user: ${username}\nsudo: ALL=(ALL) NOPASSWD:ALL|"
     fi
-    if [[ -v $username ]];
-        then sed -i "s|user: root|user: ${username}\nsudo: ALL=(ALL) NOPASSWD:ALL|"
+    if [[ -v $password ]];
+        phash=$(cat $password | mkpasswd -m sha-256 -s)
+        then sed -i "s|.*password.*|  - ${phash}|"
     fi
+    sed -i "s|.*ssh-rsa.*|  - ${pubkey}|" ${path}${vmnum}_user.yaml
 }
 
 for line in $(cat hosts.tmp)
@@ -170,10 +172,11 @@ do
     hostname=$(echo $line | cut -d ' ' -f 2)
     vmnum=$(echo $ip | cut -d '.' -f 3,4 | sed 's/\.//')
     if [[ $vlan -eq 0 ]]; then $vlan=100; fi
-    qm clone 5000 $vmnum --name $hostname --full 
+    echo -n "Now cloning VM $vmnum from a template....."
+    qm clone 5000 $vmnum --name $hostname --full &>/dev/null
     if [ $? -eq 0 ] 
-        then echo "clone OK"
-        else "clone ERROR"; exit 1
+        then echo "OK"
+        else "ERROR"; exit 1
     fi
     qm set $vmnum --tags $node,gfx
     mksnippet
@@ -186,9 +189,9 @@ do
         then
         ha-manager add vm:$vmnum --state started --max_relocate 2
         ha-manager rules add node-affinity $harule --resources vm:$vmnum --nodes pve1,pve2,pve3 --strict 1
+        echo "HA rule added"
         # ОБЯЗАТЕЛЬНО ПРОВЕРИТЬ КОМАНДУ!!!
         fi
-    echo "HA rules added"
 done
 
 # Финальная часть