diff --git a/scripts-zfs/build-template b/scripts-zfs/build-template index d7957a2..0063a90 100755 --- a/scripts-zfs/build-template +++ b/scripts-zfs/build-template @@ -29,7 +29,7 @@ VM_MACHINE=${VM_MACHINE:-"q35"} VM_MEMORY=${VM_MEMORY:-1024} VM_NET_BRIDGE=${VM_NET_BRIDGE:-"vmbr0"} VM_NET_TYPE=${VM_NET_TYPE:-"virtio"} -VM_NET_VLAN=${VM_NET_VLAN:-1} +VM_NET_VLAN=${VM_NET_VLAN:-""} VM_OS=${VM_OS:-"l26"} VM_RESIZE=${VM_RESIZE:-"1G"} VM_SCSIHW=${VM_SCSIHW:-"virtio-scsi-pci"} @@ -59,7 +59,7 @@ function help() { --name, -n Specify the VM name (default: 'template') --net-bridge Specify the VM network bridge (default: 'vmbr0') --net-type Specify the VM network type (default: 'virtio') - --net-vlan Specify the VM network vlan tag (default: '1') + --net-vlan Specify the VM network vlan tag --os Specify the VM OS (default: 'l26') --resize Increase the VM boot disk size (default: '1G') --scsihw Specify the VM storage controller (default: 'virtio-scsi-pci') @@ -229,7 +229,7 @@ function main() { --bios "${VM_BIOS}" --machine "${VM_MACHINE}" \ --scsihw "${VM_SCSIHW}" --agent enabled=1 \ --cpu cputype=host --memory "${VM_MEMORY}" \ - --net0 "${VM_NET_TYPE}",bridge="${VM_NET_BRIDGE}",tag="${VM_NET_VLAN}" + --net0 "${VM_NET_TYPE}",bridge="${VM_NET_BRIDGE}""${VM_NET_VLAN:+,tag=$VM_NET_VLAN}" # import the cloud image /usr/sbin/qm disk import "${VM_ID}" "${VM_IMAGE}" "${VM_STORAGE}" diff --git a/scripts/build-template b/scripts/build-template index 86d9025..49e0f10 100755 --- a/scripts/build-template +++ b/scripts/build-template @@ -29,7 +29,7 @@ VM_MACHINE=${VM_MACHINE:-"q35"} VM_MEMORY=${VM_MEMORY:-1024} VM_NET_BRIDGE=${VM_NET_BRIDGE:-"vmbr0"} VM_NET_TYPE=${VM_NET_TYPE:-"virtio"} -VM_NET_VLAN=${VM_NET_VLAN:-1} +VM_NET_VLAN=${VM_NET_VLAN:-""} VM_OS=${VM_OS:-"l26"} VM_RESIZE=${VM_RESIZE:-"1G"} VM_SCSIHW=${VM_SCSIHW:-"virtio-scsi-pci"} @@ -59,7 +59,7 @@ function help() { --name, -n Specify the VM name (default: 'template') --net-bridge Specify the VM network bridge (default: 'vmbr0') --net-type Specify the VM network type (default: 'virtio') - --net-vlan Specify the VM network vlan tag (default: '1') + --net-vlan Specify the VM network vlan tag --os Specify the VM OS (default: 'l26') --resize Increase the VM boot disk size (default: '1G') --scsihw Specify the VM storage controller (default: 'virtio-scsi-pci') @@ -229,7 +229,7 @@ function main() { --bios "${VM_BIOS}" --machine "${VM_MACHINE}" \ --scsihw "${VM_SCSIHW}" --agent enabled=1 \ --cpu cputype=host --memory "${VM_MEMORY}" \ - --net0 "${VM_NET_TYPE}",bridge="${VM_NET_BRIDGE}",tag="${VM_NET_VLAN}" + --net0 "${VM_NET_TYPE}",bridge="${VM_NET_BRIDGE}""${VM_NET_VLAN:+,tag=$VM_NET_VLAN}" # import the cloud image /usr/sbin/qm disk import "${VM_ID}" "${VM_IMAGE}" "${VM_STORAGE}"