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

Compare commits

base: flynx:ab97f5398af0f341ecbcd8f379b766579af95070
Branches Tags
flynx:master
..
compare: flynx:bb1b2cba154092bd6b0588b0a5aef1b1e032f394
Branches Tags
flynx:master

No commits in common. "ab97f5398af0f341ecbcd8f379b766579af95070" and "bb1b2cba154092bd6b0588b0a5aef1b1e032f394" have entirely different histories.
ab97f5398a ... bb1b2cba15

2 changed files with 10 additions and 16 deletions
Show Stats Expand all files Collapse all files

2
.pct-helpers
View File

@ -21,7 +21,7 @@ CT_DIR=${CT_DIR:=/etc/pve/lxc/}
#QUIET= #QUIET=
#DRY_RUN= #DRY_RUN=
ECHO_PREFIX="### " ECHO_PREFIX="### "
function @ (){ @(){
if [ -z $DRY_RUN ] ; then if [ -z $DRY_RUN ] ; then
! [ $QUIET ] \ ! [ $QUIET ] \
&& echo -e "${ECHO_PREFIX}$@" && echo -e "${ECHO_PREFIX}$@"

22
host/make.sh
View File

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