flynx/proxmox-utils
1
0
Fork 0
mirror of https://github.com/flynx/proxmox-utils.git synced 2025-12-17 09:01:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed admin bridge check...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2024-10-17 12:38:40 +03:00
parent 046abf01f4
commit 48923d599f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pct-helpers
View File

@ -469,9 +469,9 @@ readCTVars(){
} }
readBridgeVars(){ readBridgeVars(){
# bridge config... # bridge config...
xread "ADMIN bridge: vmbr" ADMIN_BRIDGE
xread "WAN bridge: vmbr" WAN_BRIDGE xread "WAN bridge: vmbr" WAN_BRIDGE
xread "LAN bridge: vmbr" LAN_BRIDGE xread "LAN bridge: vmbr" LAN_BRIDGE
xread "ADMIN bridge: vmbr" ADMIN_BRIDGE
} }
readVars(){ readVars(){
xread -n "Email: " EMAIL xread -n "Email: " EMAIL

6
host/make.sh
View File

@ -75,12 +75,16 @@ if xreadYes "# Create bridges?" BRIDGES ; then
"vmbr\(${WAN_BRIDGE}\|${LAN_BRIDGE}\|${ADMIN_BRIDGE}\)" \ "vmbr\(${WAN_BRIDGE}\|${LAN_BRIDGE}\|${ADMIN_BRIDGE}\)" \
"$INTERFACES" ; then "$INTERFACES" ; then
conflict= 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 if grep -q "vmbr${!br}" "$INTERFACES" ; then
conflict="${conflict}, vmbr${!br} (${br})" conflict="${conflict}, vmbr${!br} (${br})"
fi fi
done done
echo "ERROR: will not overwrite existing bridges: ${conflict:2}" >&2 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 exit 1
fi fi