.update example config

cron-callback.sh

@@ -53,7 +53,7 @@ function download_cloud_img_if_not_exist () {
     [[ -f "base/$cloudimg" ]] && return
 
     declare -A knowledge
-    # old naming
+    # old naming, deprecated
     knowledge["focal-server-cloudimg-amd64.img"]=https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
     knowledge["ubuntu-22.04-server-cloudimg-amd64.img"]=https://cloud-images.ubuntu.com/releases/22.04/release/ubuntu-22.04-server-cloudimg-amd64.img
     knowledge["ubuntu-24.04-server-cloudimg-amd64.img"]=https://cloud-images.ubuntu.com/releases/24.04/release/ubuntu-24.04-server-cloudimg-amd64.img

init.settings

+# Example config file
+
 ## init VM from cloudimg
-# name;cloudimg;disk;username;password (space will be trimmed)
-ndpa-build  ;focal-server-cloudimg-amd64.img ;60G;r;1
-gitlab-ci-ms;focal-server-cloudimg-amd64.img ;50G;r;1
-archtest    ;Arch-Linux-x86_64-cloudimg.qcow2;50G;r;1
+## name       ;cloudimg;disk;username;password (space will be trimmed)
+# ndpa-build  ;ubuntu-22.04-server.img;60G;r;1
+# gitlab-ci-ms;ubuntu-22.04-server.img;50G;user;pass
+# archtest    ;archlinux.img          ;50G;r;1
+testvm        ;ubuntu-22.04-server.img;50G;r;1
 
 ## or init VM from pre-deployed backing image (please put it into data/base/)
-# name;existing_img_fname
-ubuntucorp  ;ubuntu-intune.qcow2
-devbox      ;win10pro-22h2-virtio-uefi.qcow2
+## name       ;base_img_fname
+# ubuntucorp  ;ubuntu-intune.qcow2
+# devbox      ;win10pro-22h2-virtio-uefi.qcow2

runtime.settings

-# name;options (name will be trimmed, options will be passed as-is)
-#                              :4 used by HostVNC
-ubuntucorp  ;-m 2G -smp 2 -vnc :10 -net user,hostfwd=tcp::30471-:22
-ndpa-build  ;-m 8G -smp 4 -vnc :11 -net user,hostfwd=tcp::30472-:22 -bios /usr/share/edk2-ovmf/x64/OVMF.fd
-archtest    ;-m 4G -smp 4 -vnc :14 -net user,hostfwd=tcp::30474-:22 -bios /usr/share/edk2-ovmf/x64/OVMF.fd
-gitlab-ci-ms;-m 4G -smp 3 -vnc :12 -net user,hostfwd=tcp::30473-:22 -bios /usr/share/edk2-ovmf/x64/OVMF.fd
-devbox      ;-m 8G -smp 8 -vnc :13                                  -bios /usr/share/edk2-ovmf/x64/OVMF.fd -cpu host,hv_relaxed,hv_spinlocks=0x1fff,hv_vapic,hv_time -nic tap,ifname=vnic0,script=no,downscript=no,mac=10:11:11:11:11:10 -chardev socket,id=chrtpm,path=/extradisk/swtpm/mytpm.sock -tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0
+# Example config file
+
+## name;options (name will be trimmed, options will be passed as-is)
+# ubuntucorp  ;-m 2G -smp 2 -vnc :10 -net user,hostfwd=tcp::30471-:22
+# ndpa-build  ;-m 8G -smp 4 -vnc :11 -net user,hostfwd=tcp::30472-:22 -bios /usr/share/edk2-ovmf/x64/OVMF.fd
+# archtest    ;-m 4G -smp 4 -vnc :12 -net user,hostfwd=tcp::30473-:22 -bios /usr/share/edk2-ovmf/x64/OVMF.fd
+# gitlab-ci-ms;-m 4G -smp 3 -vnc :13 -net user,hostfwd=tcp::30474-:22 -bios /usr/share/edk2-ovmf/x64/OVMF.fd
+# devbox      ;-m 8G -smp 8 -vnc :14                                  -bios /usr/share/edk2-ovmf/x64/OVMF.fd -cpu host,hv_relaxed,hv_spinlocks=0x1fff,hv_vapic,hv_time -nic tap,ifname=vnic0,script=no,downscript=no,mac=10:11:11:11:11:10 -chardev socket,id=chrtpm,path=/extradisk/swtpm/mytpm.sock -tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0
+testvm        ;-m 2G -smp 2 -vnc :15 -net user,hostfwd=tcp::30475-:22