diff --git a/.pct-helpers b/.pct-helpers index 9a4611d..30e6c6a 100644 --- a/.pct-helpers +++ b/.pct-helpers @@ -469,9 +469,9 @@ readCTVars(){ } readBridgeVars(){ # bridge config... + xread "ADMIN bridge: vmbr" ADMIN_BRIDGE xread "WAN bridge: vmbr" WAN_BRIDGE xread "LAN bridge: vmbr" LAN_BRIDGE - xread "ADMIN bridge: vmbr" ADMIN_BRIDGE } readVars(){ xread -n "Email: " EMAIL diff --git a/host/make.sh b/host/make.sh index 43941d9..46663d9 100755 --- a/host/make.sh +++ b/host/make.sh @@ -75,12 +75,16 @@ if xreadYes "# Create bridges?" BRIDGES ; then "vmbr\(${WAN_BRIDGE}\|${LAN_BRIDGE}\|${ADMIN_BRIDGE}\)" \ "$INTERFACES" ; then conflict= - for br in WAN_BRIDGE LAN_BRIDGE ADMIN_BRIDGE ; do + #for br in WAN_BRIDGE LAN_BRIDGE ADMIN_BRIDGE ; do + for br in WAN_BRIDGE LAN_BRIDGE ; do if grep -q "vmbr${!br}" "$INTERFACES" ; then conflict="${conflict}, vmbr${!br} (${br})" fi done echo "ERROR: will not overwrite existing bridges: ${conflict:2}" >&2 + if grep -q "vmbr${!ADMIN_BRIDGE}" "$INTERFACES" ; then + echo "NOTE: reusing vmbr${ADMIN_BRIDGE} for ADMIN." + fi exit 1 fi