diff --git a/vmcreate1.sh b/vmcreate1.sh index 9dbf2ba..3e456d1 100644 --- a/vmcreate1.sh +++ b/vmcreate1.sh @@ -9,13 +9,6 @@ storage="syno-tigra" path="/mnt/pve/$storage/snippets" -username="root" -phash="" - -if dpkg -s mkpasswd &>/dev/null; then - echo -n ""; - else - echo "" show_help() echo 'Usage:' @@ -154,24 +147,6 @@ keypair_generate (){ pubkey="$privkey".pub } -# Функция, которая создаёт user CloudInit-файл -mksnippet(){ - snippet="${path}${vmnum}_user.yaml" - touch $snippet && echo -n "" $snippet - echo "hostname: ${hostname}" - echo "manage_etc_hosts: true" - echo "fqdn: $hostname" - echo "user: $username" - echo "disable_root: False" - echo "ssh_authorized_keys:\n - " - echo - echo $password | mkpasswd -m sha-512 -s > - -} - - - - for line in $(cat hosts.tmp) do ip=$(echo $line | cut -d ' ' -f 1) @@ -188,7 +163,9 @@ do qm set $vmnum --tags 3,gfx ## preparing custom CloudInit snippets cp ./user.yaml ${path}${vmnum}_user.yaml - # sed -i "s/HOSTNAME/$hostname/g" ${path}${vmnum}_user.yaml + sed -i "s/HOSTNAME/$hostname/g" ${path}${vmnum}_user.yaml + if [[ -v $username ]]; + then sed -i "s|user: root|user: ${username}\nsudo: ALL=(ALL) NOPASSWD:ALL|" qm resize $vmnum scsi0 +50G qm set $vmnum --cicustom "user=${storage}:snippets/${vmnum}_user.yaml" qm set $vmnum --ipconfig0 ip=$ip/24,gw=10.10.35.1