From a3c1401e1e7e6fcd248d3650d6367a03df9b7c02 Mon Sep 17 00:00:00 2001 From: Wolfgang Date: Fri, 9 Jan 2026 22:58:06 +0100 Subject: [PATCH] Schritt7_VLAN90_Default --- install.sh | 6 +++++- libsupabase.sh | 14 +++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index 956b204..b1d7e5e 100755 --- a/install.sh +++ b/install.sh @@ -33,6 +33,7 @@ MEMORY="4096" SWAP="512" DISK="50" BRIDGE="vmbr0" +VLAN="90" STORAGE="local-zfs" IPCFG="dhcp" UNPRIV="1" @@ -50,6 +51,7 @@ while [[ $# -gt 0 ]]; do --swap) SWAP="${2:-}"; shift 2 ;; --disk) DISK="${2:-}"; shift 2 ;; --bridge) BRIDGE="${2:-}"; shift 2 ;; + --vlan) VLAN="${2:-}"; shift 2 ;; --storage) STORAGE="${2:-}"; shift 2 ;; --ip) IPCFG="${2:-}"; shift 2 ;; --privileged) UNPRIV="0"; shift 1 ;; @@ -62,6 +64,7 @@ done # Basic validation [[ "$CORES" =~ ^[0-9]+$ ]] || die "--cores must be integer" +[[ "$VLAN" =~ ^[0-9]+$ ]] || die "--vlan must be integer" [[ "$MEMORY" =~ ^[0-9]+$ ]] || die "--memory must be integer" [[ "$SWAP" =~ ^[0-9]+$ ]] || die "--swap must be integer" [[ "$DISK" =~ ^[0-9]+$ ]] || die "--disk must be integer" @@ -102,6 +105,7 @@ info "SCRIPT_DIR=${SCRIPT_DIR}" info "CT_HOSTNAME=${CT_HOSTNAME}" info "cores=${CORES} memory=${MEMORY}MB swap=${SWAP}MB disk=${DISK}GB" info "bridge=${BRIDGE} storage=${STORAGE} ip=${IPCFG} unprivileged=${UNPRIV}" +info "vlan=${VLAN}" if [[ -n "$TG_TOKEN" && -n "$TG_CHAT" ]]; then info "Telegram enabled (chat=${TG_CHAT})" @@ -112,7 +116,7 @@ fi # --------------------------- # Step 5: Create CT # --------------------------- -NET0="$(pve_build_net0 "$BRIDGE" "$IPCFG")" +NET0="$(pve_build_net0 "$BRIDGE" "$IPCFG" "$VLAN")" ROOTFS="${STORAGE}:${DISK}" FEATURES="nesting=1,keyctl=1,fuse=1" diff --git a/libsupabase.sh b/libsupabase.sh index 315760e..2ea925e 100755 --- a/libsupabase.sh +++ b/libsupabase.sh @@ -69,11 +69,19 @@ pve_template_ensure_debian12() { } pve_build_net0() { - local bridge="$1" ip="$2" + local bridge="$1" ip="$2" vlan="${3:-}" if [[ "$ip" == "dhcp" ]]; then - echo "name=eth0,bridge=${bridge},ip=dhcp" + if [[ -n "$vlan" ]]; then + echo "name=eth0,bridge=${bridge},tag=${vlan},ip=dhcp" + else + echo "name=eth0,bridge=${bridge},ip=dhcp" + fi else - echo "name=eth0,bridge=${bridge},ip=${ip},gw=$(echo "$ip" | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+)\.[0-9]+\/[0-9]+/\1.1/')" + if [[ -n "$vlan" ]]; then + echo "name=eth0,bridge=${bridge},tag=${vlan},ip=${ip}" + else + echo "name=eth0,bridge=${bridge},ip=${ip}" + fi fi }