From 994de33a6780f0b7f7d995c1b2af019808e40f18 Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Mon, 16 Jun 2025 12:10:08 +0200
Subject: [PATCH] Update ubuntu2410-vm.sh

---
 vm/ubuntu2410-vm.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/vm/ubuntu2410-vm.sh b/vm/ubuntu2410-vm.sh
index 26744d54..ef8d6d8c 100644
--- a/vm/ubuntu2410-vm.sh
+++ b/vm/ubuntu2410-vm.sh
@@ -215,7 +215,7 @@ function default_settings() {
 
 function apply_env_overrides() {
   METHOD="env"
-  VMID="$var_vmid"
+  [ -n "$var_vmid" ] && VMID="$var_vmid"
   HN=$(echo "${var_hostname,,}" | tr -cd '[:alnum:]-')
   [[ -z "$HN" ]] && HN="ubuntu"
   [[ ! "$HN" =~ ^[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$ ]] && {
@@ -249,8 +249,11 @@ function apply_env_overrides() {
   [[ "$var_cpu" =~ ^[1-9][0-9]*$ ]] && CORE_COUNT="$var_cpu" || CORE_COUNT="2"
   [[ "$var_ram" =~ ^[1-9][0-9]*$ ]] && RAM_SIZE="$var_ram" || RAM_SIZE="2048"
   [[ -n "$var_disk" ]] && DISK_SIZE="$var_disk" || DISK_SIZE="8G"
-  BRG="$var_bridge"
-  MAC="$var_mac"
+  [ -n "$var_bridge" ] && BRG="$var_bridge"
+  [ -z "$BRG" ] && BRG="vmbr0"
+
+  [ -n "$var_mac" ] && MAC="$var_mac"
+  [ -z "$MAC" ] && MAC="$GEN_MAC"
   VLAN=${var_vlan:+",tag=$var_vlan"}
   MTU=${var_mtu:+",mtu=$var_mtu"}
   START_VM="$var_start_vm"