fix：整体优化

Author: spiritLHLS

README.md

@@ -12,7 +12,7 @@
 - 使用 KubeVirt 提供虚拟机能力（基于 KVM/QEMU）
 - 使用 CDI（Containerized Data Importer）导入云镜像
 - 通过 NodePort Service + iptables DNAT 实现端口映射
-- 支持系统：Ubuntu 22.04, Debian 12, AlmaLinux 9, RockyLinux 9, CentOS Stream 9, openSUSE Leap 15.5
+- 支持系统：Ubuntu 22.04/24.04, Debian 11/12, AlmaLinux 9, RockyLinux 9, CentOS 7, CentOS Stream 8/9, openSUSE Leap 15.5
 - 支持架构：amd64 (x86_64)
 - 宿主机系统支持：Ubuntu 20.04/22.04/24.04，Debian 11/12
 
@@ -26,6 +26,7 @@
 ## 安装 KubeVirt 环境
 
 ```bash
+export noninteractive=true
 bash <(curl -sSL https://raw.githubusercontent.com/oneclickvirt/kubevirt/main/kubevirtinstall.sh)
 ```
 
@@ -56,7 +57,7 @@ chmod +x onevm.sh
 | 系统标识 | 说明 | 镜像来源 |
 |----------|------|----------|
 | `ubuntu` | Ubuntu 22.04 LTS | pve_kvm_images(ubuntu22) → kvm_images(ubuntu22) → 官方 |
-| `ubuntu24` | Ubuntu 24.04 LTS | pve_kvm_images(ubuntu22) → kvm_images(ubuntu22) → 官方 |
+| `ubuntu24` | Ubuntu 24.04 LTS | pve_kvm_images(ubuntu24) → kvm_images(ubuntu24) → 官方 |
 | `debian` | Debian 12 | pve_kvm_images(debian12) → kvm_images(debian12) → 官方 |
 | `debian11` | Debian 11 | pve_kvm_images(debian11) → kvm_images(debian11) → 官方 |
 | `almalinux` | AlmaLinux 9 | pve_kvm_images(almalinux9) → kvm_images(almalinux9) → 官方 |
@@ -77,6 +78,7 @@ chmod +x onevm.sh
 ```bash
 curl -sSL -o create_vm.sh https://raw.githubusercontent.com/oneclickvirt/kubevirt/main/scripts/create_vm.sh
 chmod +x create_vm.sh
+export noninteractive=true
 ./create_vm.sh
 ```
 
@@ -93,12 +95,14 @@ chmod +x listvms.sh
 ```bash
 curl -sSL -o deletevm.sh https://raw.githubusercontent.com/oneclickvirt/kubevirt/main/scripts/deletevm.sh
 chmod +x deletevm.sh
+export noninteractive=true
 ./deletevm.sh <name>
 ```
 
 ## 卸载（完整清理）
 
 ```bash
+export noninteractive=true
 bash <(curl -sSL https://raw.githubusercontent.com/oneclickvirt/kubevirt/main/kubevirtuninstall.sh)
 ```
 
@@ -157,4 +161,4 @@ virtctl restart <vmname> -n kubevirt-vms
    - Debian/Ubuntu 系统自动安装 `iptables-persistent` 和 `netfilter-persistent`
    - Red Hat/CentOS 系统自动安装 `iptables-services`
    - 规则变更后自动持久化，确保重启后不失效
-4. 如需重置密码，通过 `virtctl console` 进入控制台手动修改
+4. 如需重置密码，通过 `virtctl console` 进入控制台手动修改

kubevirtinstall.sh

@@ -7,14 +7,15 @@
 #
 # 支持通过环境变量实现完全无交互安装：
 #
+#   noninteractive=true  统一无交互标记
 #   K3S_VERSION       K3s 版本          默认: v1.29.3+k3s1
 #   KUBEVIRT_VERSION  KubeVirt 版本     默认: v1.2.1
 #   CDI_VERSION       CDI 版本          默认: v1.59.0
 #   VIRTCTL_VERSION   virtctl 版本      默认: v1.2.1
 #
 # 示例（一键无交互安装）：
-#   bash kubevirtinstall.sh
-#   KUBEVIRT_VERSION=v1.3.0 CDI_VERSION=v1.60.0 bash kubevirtinstall.sh
+#   noninteractive=true bash kubevirtinstall.sh
+#   noninteractive=true KUBEVIRT_VERSION=v1.3.0 CDI_VERSION=v1.60.0 bash kubevirtinstall.sh
 #
 # =====================================================================
 

kubevirtuninstall.sh

@@ -7,11 +7,12 @@
 #
 # 支持通过环境变量实现完全无交互卸载：
 #
-#   AUTO_YES=y   跳过所有确认提示，直接执行卸载
-#   FORCE_YES=y  同 AUTO_YES=y（兼容旧版写法）
+#   noninteractive=true  跳过所有确认提示，直接执行卸载
+#   AUTO_YES=y           兼容旧版写法，同 noninteractive=true
+#   FORCE_YES=y          同 AUTO_YES=y
 #
 # 示例（一键静默卸载）：
-#   AUTO_YES=y bash kubevirtuninstall.sh
+#   noninteractive=true bash kubevirtuninstall.sh
 #
 # =====================================================================
 
@@ -39,9 +40,34 @@ check_root() {
     fi
 }
 
+_is_truthy() {
+    case "$(printf '%s' "${1:-}" | tr '[:upper:]' '[:lower:]')" in
+        1|true|yes|y|on) return 0 ;;
+        *) return 1 ;;
+    esac
+}
+
+_is_noninteractive() {
+    _is_truthy "${noninteractive:-}" || \
+    _is_truthy "${NONINTERACTIVE:-}" || \
+    _is_truthy "${AUTO_YES:-}" || \
+    _is_truthy "${FORCE_YES:-}"
+}
+
+ensure_kubectl() {
+    if command -v kubectl >/dev/null 2>&1; then
+        return 0
+    fi
+    if command -v k3s >/dev/null 2>&1; then
+        kubectl() { k3s kubectl "$@"; }
+        return 0
+    fi
+    return 1
+}
+
 # ===== 确认操作 =====
 confirm_uninstall() {
-    if [ "${FORCE_YES}" = "y" ] || [ "${AUTO_YES}" = "y" ]; then
+    if _is_noninteractive; then
         return 0
     fi
     echo ""
@@ -347,6 +373,7 @@ main() {
 
     check_root
     confirm_uninstall
+    ensure_kubectl || true
     stop_all_vms
     uninstall_kubevirt
     uninstall_cdi

scripts/create_vm.sh

@@ -17,12 +17,13 @@
 #   PORT_RANGE_SIZE   每台额外端口数量         默认: 26
 #   EXTRA_PORT_START  额外端口起始值           默认: 35000
 #   SYSTEM            操作系统               默认: ubuntu
-#   AUTO_YES=y        跳过所有确认提示
+#   noninteractive=true  跳过所有确认提示，未提供的参数使用默认值
+#   AUTO_YES=y           兼容旧版写法，同 noninteractive=true
 #
 # 示例：
 #   VM_COUNT=3 CPU=2 MEMORY_GB=2 DISK_GB=20 PASSWORD=MyPass123 \
 #   SSH_START_PORT=25000 PORT_RANGE_SIZE=26 EXTRA_PORT_START=35000 \
-#   SYSTEM=debian AUTO_YES=y bash create_vm.sh
+#   SYSTEM=debian noninteractive=true bash create_vm.sh
 #
 # =====================================================================
 
@@ -53,25 +54,77 @@ check_onevm_script() {
         ONEVM_SCRIPT="./onevm.sh"
     else
         _info "正在下载 onevm.sh..."
-        curl -sSL -o /tmp/onevm.sh https://raw.githubusercontent.com/oneclickvirt/kubevirt/main/scripts/onevm.sh
+        if ! curl -fsSL -o /tmp/onevm.sh https://raw.githubusercontent.com/oneclickvirt/kubevirt/main/scripts/onevm.sh; then
+            _error "下载 onevm.sh 失败，请检查网络连接"
+        fi
         chmod +x /tmp/onevm.sh
         ONEVM_SCRIPT="/tmp/onevm.sh"
     fi
     _info "使用脚本：$ONEVM_SCRIPT"
 }
 
-# ===== 是否处于无交互模式（所有参数均由环境变量提供）=====
+# ===== 无交互模式判断 =====
+_is_truthy() {
+    case "$(printf '%s' "${1:-}" | tr '[:upper:]' '[:lower:]')" in
+        1|true|yes|y|on) return 0 ;;
+        *) return 1 ;;
+    esac
+}
+
 _is_noninteractive() {
-    [ "${AUTO_YES}" = "y" ] || \
+    _is_truthy "${noninteractive:-}" || \
+    _is_truthy "${NONINTERACTIVE:-}" || \
+    _is_truthy "${AUTO_YES:-}" || \
+    _is_truthy "${FORCE_YES:-}" || \
     ( [ -n "${VM_COUNT+x}" ] && [ -n "${VM_PREFIX+x}" ] && \
       [ -n "${CPU+x}" ] && [ -n "${MEMORY_GB+x}" ] && \
       [ -n "${DISK_GB+x}" ] && [ -n "${PASSWORD+x}" ] && \
       [ -n "${SSH_START_PORT+x}" ] && [ -n "${SYSTEM+x}" ] )
 }
 
+_validate_uint_range() {
+    local name="$1" value="$2" min="$3" max="$4"
+    if ! [[ "$value" =~ ^[0-9]+$ ]] || [ "$value" -lt "$min" ] || [ "$value" -gt "$max" ]; then
+        _error "${name} 无效：${value}（必须在 ${min}-${max} 范围内）"
+    fi
+}
+
+_ranges_overlap() {
+    local start_a="$1" end_a="$2" start_b="$3" end_b="$4"
+    [ "$start_a" -le "$end_b" ] && [ "$start_b" -le "$end_a" ]
+}
+
+validate_params() {
+    _validate_uint_range "虚拟机数量" "$VM_COUNT" 1 9999
+    _validate_uint_range "起始编号" "$START_NUM" 0 999999
+    _validate_uint_range "CPU 核数" "$CPU" 1 256
+    _validate_uint_range "内存" "$MEMORY_GB" 1 1048576
+    _validate_uint_range "磁盘" "$DISK_GB" 1 1048576
+    _validate_uint_range "SSH 起始端口" "$SSH_START_PORT" 1 65535
+    _validate_uint_range "额外端口范围大小" "$PORT_RANGE_SIZE" 0 65535
+
+    local ssh_end=$((SSH_START_PORT + VM_COUNT - 1))
+    if [ "$ssh_end" -gt 65535 ]; then
+        _error "SSH 端口范围越界：${SSH_START_PORT}-${ssh_end}"
+    fi
+
+    if [ "$PORT_RANGE_SIZE" -gt 0 ]; then
+        _validate_uint_range "额外端口起始值" "$EXTRA_PORT_START" 1 65535
+        local extra_end=$((EXTRA_PORT_START + VM_COUNT * PORT_RANGE_SIZE - 1))
+        if [ "$extra_end" -gt 65535 ]; then
+            _error "额外端口范围越界：${EXTRA_PORT_START}-${extra_end}"
+        fi
+        if _ranges_overlap "$SSH_START_PORT" "$ssh_end" "$EXTRA_PORT_START" "$extra_end"; then
+            _error "SSH 端口范围 ${SSH_START_PORT}-${ssh_end} 与额外端口范围 ${EXTRA_PORT_START}-${extra_end} 重叠"
+        fi
+    else
+        EXTRA_PORT_START="${EXTRA_PORT_START:-0}"
+    fi
+}
+
 # ===== 交互式参数收集（若环境变量已设置则使用环境变量，跳过 read）=====
 collect_params() {
-    # 若 AUTO_YES=y 且所有必要变量已设置，无需打印菜单
+    # 无交互模式下无需打印菜单
     if ! _is_noninteractive; then
         echo ""
         echo "======================================================"
@@ -81,7 +134,7 @@ collect_params() {
     fi
 
     # ----- 数量 -----
-    if [ -z "${VM_COUNT+x}" ]; then
+    if [ -z "${VM_COUNT+x}" ] && ! _is_noninteractive; then
         read -rp "请输入虚拟机数量 [默认: 1]: " VM_COUNT
     fi
     VM_COUNT="${VM_COUNT:-1}"
@@ -90,7 +143,7 @@ collect_params() {
     fi
 
     # ----- 名称前缀 -----
-    if [ -z "${VM_PREFIX+x}" ]; then
+    if [ -z "${VM_PREFIX+x}" ] && ! _is_noninteractive; then
         read -rp "请输入虚拟机名称前缀 [默认: vm]: " VM_PREFIX
     fi
     VM_PREFIX="${VM_PREFIX:-vm}"
@@ -99,31 +152,31 @@ collect_params() {
     fi
 
     # ----- 起始编号 -----
-    if [ -z "${START_NUM+x}" ]; then
+    if [ -z "${START_NUM+x}" ] && ! _is_noninteractive; then
         read -rp "请输入起始编号 [默认: 1]: " START_NUM
     fi
     START_NUM="${START_NUM:-1}"
 
     # ----- CPU -----
-    if [ -z "${CPU+x}" ]; then
+    if [ -z "${CPU+x}" ] && ! _is_noninteractive; then
         read -rp "请输入每台虚拟机 CPU 核数 [默认: 1]: " CPU
     fi
     CPU="${CPU:-1}"
 
     # ----- 内存 -----
-    if [ -z "${MEMORY_GB+x}" ]; then
+    if [ -z "${MEMORY_GB+x}" ] && ! _is_noninteractive; then
         read -rp "请输入每台虚拟机内存（GB）[默认: 1]: " MEMORY_GB
     fi
     MEMORY_GB="${MEMORY_GB:-1}"
 
     # ----- 磁盘 -----
-    if [ -z "${DISK_GB+x}" ]; then
+    if [ -z "${DISK_GB+x}" ] && ! _is_noninteractive; then
         read -rp "请输入每台虚拟机磁盘大小（GB）[默认: 10]: " DISK_GB
     fi
     DISK_GB="${DISK_GB:-10}"
 
     # ----- 密码 -----
-    if [ -z "${PASSWORD+x}" ]; then
+    if [ -z "${PASSWORD+x}" ] && ! _is_noninteractive; then
         read -rp "请输入 root 密码 [默认: 随机生成]: " PASSWORD
     fi
     if [ -z "$PASSWORD" ]; then
@@ -133,27 +186,28 @@ collect_params() {
     fi
 
     # ----- SSH 起始端口 -----
-    if [ -z "${SSH_START_PORT+x}" ]; then
+    if [ -z "${SSH_START_PORT+x}" ] && ! _is_noninteractive; then
         read -rp "请输入 SSH 起始端口 [默认: 25000]: " SSH_START_PORT
     fi
     SSH_START_PORT="${SSH_START_PORT:-25000}"
 
     # ----- 额外端口范围大小 -----
-    if [ -z "${PORT_RANGE_SIZE+x}" ]; then
+    if [ -z "${PORT_RANGE_SIZE+x}" ] && ! _is_noninteractive; then
         read -rp "请输入每台 VM 的额外端口范围大小（0=不分配）[默认: 26]: " PORT_RANGE_SIZE
     fi
     PORT_RANGE_SIZE="${PORT_RANGE_SIZE:-26}"
+    _validate_uint_range "额外端口范围大小" "$PORT_RANGE_SIZE" 0 65535
 
     # ----- 额外端口起始值 -----
     if [ "$PORT_RANGE_SIZE" -gt 0 ]; then
-        if [ -z "${EXTRA_PORT_START+x}" ]; then
+        if [ -z "${EXTRA_PORT_START+x}" ] && ! _is_noninteractive; then
             read -rp "请输入额外端口起始值 [默认: 35000]: " EXTRA_PORT_START
         fi
         EXTRA_PORT_START="${EXTRA_PORT_START:-35000}"
     fi
 
     # ----- 操作系统 -----
-    if [ -z "${SYSTEM+x}" ]; then
+    if [ -z "${SYSTEM+x}" ] && ! _is_noninteractive; then
         echo ""
         echo "可选操作系统："
         echo "  1) ubuntu       - Ubuntu 22.04 LTS"
@@ -165,12 +219,13 @@ collect_params() {
         echo "  7) centos8-stream - CentOS Stream 8"
         echo "  8) centos-stream  - CentOS Stream 9"
         echo "  9) opensuse     - openSUSE Leap 15.5"
+        echo "  10) ubuntu24    - Ubuntu 24.04 LTS"
         echo ""
         echo "  镜像优先从 oneclickvirt/pve_kvm_images 和 oneclickvirt/kvm_images 获取"
         read -rp "请选择系统编号或输入系统名称 [默认: 1/ubuntu]: " SYSTEM_INPUT
         SYSTEM_INPUT="${SYSTEM_INPUT:-1}"
     else
-        SYSTEM_INPUT="${SYSTEM}"
+        SYSTEM_INPUT="${SYSTEM:-ubuntu}"
     fi
 
     case "$SYSTEM_INPUT" in
@@ -183,9 +238,12 @@ collect_params() {
         7|centos8-stream|centos8) SYSTEM="centos8-stream" ;;
         8|centos-stream|centos9)  SYSTEM="centos-stream" ;;
         9|opensuse)      SYSTEM="opensuse" ;;
+        10|ubuntu24|ubuntu2404) SYSTEM="ubuntu24" ;;
         *) _error "无效的系统选择：$SYSTEM_INPUT" ;;
     esac
 
+    validate_params
+
     # ----- 配置预览 -----
     echo ""
     echo "======================================================"
@@ -205,7 +263,7 @@ collect_params() {
     echo ""
 
     # ----- 最终确认 -----
-    if [ "${AUTO_YES}" != "y" ]; then
+    if ! _is_noninteractive; then
         read -rp "确认创建？(y/n): " CONFIRM
         if [ "$CONFIRM" != "y" ] && [ "$CONFIRM" != "Y" ]; then
             _info "已取消"
@@ -222,13 +280,13 @@ check_disk_space() {
 
     if [ "$available_gb" -lt "$required_gb" ]; then
         _warn "可用磁盘空间 ${available_gb}GB 可能不足（需要约 ${required_gb}GB）"
-        if [ "${AUTO_YES}" != "y" ]; then
+        if ! _is_noninteractive; then
             read -rp "是否继续？(y/n): " cont
             if [ "$cont" != "y" ] && [ "$cont" != "Y" ]; then
                 exit 0
             fi
         else
-            _warn "AUTO_YES=y，忽略磁盘空间警告，继续执行..."
+            _warn "noninteractive=true，忽略磁盘空间警告，继续执行..."
         fi
     fi
 }