From 6f49e7a01ed42cb1227e5070f5d1095342e9bc29 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 29 Dec 2024 20:10:29 +0800
Subject: debian12-support

---
 others/vm3/compute/create.sh | 13 ++++++++++---
 others/vm3/compute/list.sh   | 45 --------------------------------------------
 others/vm3/compute/ls.sh     | 45 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 48 deletions(-)
 delete mode 100755 others/vm3/compute/list.sh
 create mode 100755 others/vm3/compute/ls.sh

(limited to 'others/vm3/compute')

diff --git a/others/vm3/compute/create.sh b/others/vm3/compute/create.sh
index 3e6c088..a1d84f6 100755
--- a/others/vm3/compute/create.sh
+++ b/others/vm3/compute/create.sh
@@ -88,11 +88,18 @@ if [[ ${os,,} == *"freebsd"* ]]; then
     ostype="generic"
 fi
 
+# Define the disk options based on OS type
+if [ "$os" = "debian12" ]; then
+    disk_opts="--disk path=$new_vm,format=qcow2"
+else
+    disk_opts="--disk path=$new_vm,format=qcow2 --disk path=$seed_iso,device=cdrom"
+fi
+
+# Use the conditional disk options in virt-install
 sudo virt-install --name $vmname \
   --vcpus $vcpu \
-  --memory "$((ram_gb * 1024))"\
-  --disk path=$new_vm,format=qcow2 \
-  --disk path=$seed_iso,device=cdrom \
+  --memory "$((ram_gb * 1024))" \
+  $disk_opts \
   --os-type $ostype \
   --os-variant $os \
   --virt-type kvm \
diff --git a/others/vm3/compute/list.sh b/others/vm3/compute/list.sh
deleted file mode 100755
index b62ef14..0000000
--- a/others/vm3/compute/list.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-#!/bin/bash
-printf "%-10s %-15s %-8s %-6s %-8s %-12s %-10s\n" "Network" "IP" "State" "vCPUs" "RAM(GB)" "Disk(GB)" "Name"
-printf "%-10s %-15s %-8s %-6s %-8s %-12s %-10s\n" "----------" "---------------" "--------" "-----" "-------" "-----------" "----------"
-
-# Get all VMs
-vms=$(sudo virsh list --name --all)
-
-# Cache the network leases once
-default_leases=$(sudo virsh net-dhcp-leases default 2>/dev/null)
-
-for vm in $vms; do
-    # Get XML once and use it multiple times
-    xml=$(sudo virsh dumpxml "$vm" 2>/dev/null)
-    
-    # Extract all data from the cached XML
-    mac=$(echo "$xml" | grep "mac address" | awk -F\' '{ print $2}')
-    net=$(echo "$xml" | grep "<source network" | awk -F\' '{print $2}')
-    if [ -z "$net" ]; then
-        net="default"
-    fi
-    
-    # Use cached leases
-    ip=$(echo "$default_leases" | grep "$mac" | awk '{print $5}' | cut -f1 -d'/')
-    
-    # Run commands in background and save to temp files
-    sudo virsh domstate "$vm" 2>/dev/null > /tmp/state.$$ &
-    echo "$xml" | grep "<vcpu" | awk -F'[<>]' '{print $3}' > /tmp/vcpus.$$ &
-    echo "$xml" | grep "<memory" | awk -F'[<>]' '{print $3}' | awk '{ printf "%.2f", $1/1048576 }' > /tmp/ram.$$ &
-    sudo du -sk "/var/lib/libvirt/images/${vm}/${vm}.qcow2" 2>/dev/null | awk '{ printf "%.2f", $1/1024/1024 }' > /tmp/disk.$$ &
-    
-    wait
-    
-    # Read from temp files
-    state=$(cat /tmp/state.$$ 2>/dev/null)
-    vcpus=$(cat /tmp/vcpus.$$ 2>/dev/null)
-    ram=$(cat /tmp/ram.$$ 2>/dev/null)
-    disk=$(cat /tmp/disk.$$ 2>/dev/null)
-    
-    # Clean up temp files
-    rm -f /tmp/state.$$ /tmp/vcpus.$$ /tmp/ram.$$ /tmp/disk.$$
-    
-    printf "%-10s %-15s %-8s %-6s %-8s %-12s %-10s\n" \
-        "$net" "$ip" "$state" "$vcpus" "$ram" "$disk" "$vm"
-done
diff --git a/others/vm3/compute/ls.sh b/others/vm3/compute/ls.sh
new file mode 100755
index 0000000..b62ef14
--- /dev/null
+++ b/others/vm3/compute/ls.sh
@@ -0,0 +1,45 @@
+
+#!/bin/bash
+printf "%-10s %-15s %-8s %-6s %-8s %-12s %-10s\n" "Network" "IP" "State" "vCPUs" "RAM(GB)" "Disk(GB)" "Name"
+printf "%-10s %-15s %-8s %-6s %-8s %-12s %-10s\n" "----------" "---------------" "--------" "-----" "-------" "-----------" "----------"
+
+# Get all VMs
+vms=$(sudo virsh list --name --all)
+
+# Cache the network leases once
+default_leases=$(sudo virsh net-dhcp-leases default 2>/dev/null)
+
+for vm in $vms; do
+    # Get XML once and use it multiple times
+    xml=$(sudo virsh dumpxml "$vm" 2>/dev/null)
+    
+    # Extract all data from the cached XML
+    mac=$(echo "$xml" | grep "mac address" | awk -F\' '{ print $2}')
+    net=$(echo "$xml" | grep "<source network" | awk -F\' '{print $2}')
+    if [ -z "$net" ]; then
+        net="default"
+    fi
+    
+    # Use cached leases
+    ip=$(echo "$default_leases" | grep "$mac" | awk '{print $5}' | cut -f1 -d'/')
+    
+    # Run commands in background and save to temp files
+    sudo virsh domstate "$vm" 2>/dev/null > /tmp/state.$$ &
+    echo "$xml" | grep "<vcpu" | awk -F'[<>]' '{print $3}' > /tmp/vcpus.$$ &
+    echo "$xml" | grep "<memory" | awk -F'[<>]' '{print $3}' | awk '{ printf "%.2f", $1/1048576 }' > /tmp/ram.$$ &
+    sudo du -sk "/var/lib/libvirt/images/${vm}/${vm}.qcow2" 2>/dev/null | awk '{ printf "%.2f", $1/1024/1024 }' > /tmp/disk.$$ &
+    
+    wait
+    
+    # Read from temp files
+    state=$(cat /tmp/state.$$ 2>/dev/null)
+    vcpus=$(cat /tmp/vcpus.$$ 2>/dev/null)
+    ram=$(cat /tmp/ram.$$ 2>/dev/null)
+    disk=$(cat /tmp/disk.$$ 2>/dev/null)
+    
+    # Clean up temp files
+    rm -f /tmp/state.$$ /tmp/vcpus.$$ /tmp/ram.$$ /tmp/disk.$$
+    
+    printf "%-10s %-15s %-8s %-6s %-8s %-12s %-10s\n" \
+        "$net" "$ip" "$state" "$vcpus" "$ram" "$disk" "$vm"
+done
-- 
cgit v1.2.3-70-g09d2