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

minor refactoring...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2024-08-06 02:39:27 +03:00
parent 0be2837c6d
commit ab97f5398a
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
host/make.sh
View File

@ -67,14 +67,16 @@ if xreadYes "# Create bridges?" BRIDGES ; then
xread "Gate ADMIN IP: " GATE_ADMIN_IP xread "Gate ADMIN IP: " GATE_ADMIN_IP
readBridgeVars readBridgeVars
INTERFACES=/etc/network/interfaces
# check if new bridges already exist in interfaces... # check if new bridges already exist in interfaces...
if [ -e /etc/network/interfaces ] \ if [ -e "$INTERFACES" ] \
&& grep -q \ && grep -q \
"vmbr\(${WAN_BRIDGE}\|${LAN_BRIDGE}\|${ADMIN_BRIDGE}\)" \ "vmbr\(${WAN_BRIDGE}\|${LAN_BRIDGE}\|${ADMIN_BRIDGE}\)" \
/etc/network/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
if grep -q "vmbr${!br}" /etc/network/interfaces ; then if grep -q "vmbr${!br}" "$INTERFACES" ; then
conflict="${conflict}, vmbr${!br} (${br})" conflict="${conflict}, vmbr${!br} (${br})"
fi fi
done done
@ -82,8 +84,8 @@ if xreadYes "# Create bridges?" BRIDGES ; then
exit 1 exit 1
fi fi
@ cp /etc/network/interfaces{,.bak} @ cp "$INTERFACES"{,.bak}
@ cp /etc/network/interfaces{,.new} @ cp "$INTERFACES"{,.new}
BRIDGES="$(\ BRIDGES="$(\
cat bridges.tpl \ cat bridges.tpl \
@ -93,18 +95,18 @@ if xreadYes "# Create bridges?" BRIDGES ; then
HOST_ADMIN_IP GATE_ADMIN_IP)" HOST_ADMIN_IP GATE_ADMIN_IP)"
if [ -z "$DRY_RUN" ] ; then if [ -z "$DRY_RUN" ] ; then
# XXX add $BRIDGES to /etc/network/interfaces either before the # XXX add $BRIDGES to "$INTERFACES" either before the
# source command or at the end... # source command or at the end...
# XXX # XXX
echo "$BRIDGES" >> /etc/network/interfaces.new echo "$BRIDGES" >> "$INTERFACES".new
else else
echo "$BRIDGES" echo "$BRIDGES"
fi fi
if reviewApplyChanges /etc/network/interfaces ; then if reviewApplyChanges "$INTERFACES" ; then
if ! @ ifreload -a ; then if ! @ ifreload -a ; then
# reset settings back if ifreload fails... # reset settings back if ifreload fails...
@ cp /etc/network/interfaces{.bak,} @ cp "$INTERFACES"{.bak,}
@ ifreload -a @ ifreload -a
fi fi
fi fi