Unverified Commit f0128500 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

Merge branch 'master' into dev2

parents edfd7b2c 1bb62c49

src/network.sh

+6 −7
Original line number Diff line number Diff line
@@ -412,7 +412,10 @@ configurePasst() { 
  fi



  PASST_OPTS=$(echo "$PASST_OPTS" | sed 's/\t/ /g' | tr -s ' ' | sed 's/^ *//')

  [[ "$DEBUG" == [Yy1]* ]] && printf "Passt arguments:\n\n%s\n\n" "${PASST_OPTS// -/$'\n-'}"



  if [[ "$DEBUG" == [Yy1]* || "$PASST_DEBUG" == [Yy1]* ]]; then

    printf "Passt arguments:\n\n%s\n\n" "${PASST_OPTS// -/$'\n-'}"

  fi



  [ ! -f "$PASST" ] && cp /usr/bin/passt* /run
@@ -549,11 +552,7 @@ configureNAT() { 
  exclude=$(getHostPorts)



  if [ -n "$exclude" ]; then

    if [[ "$exclude" != *","* ]]; then

      exclude=" ! --dport $exclude"

    else

      exclude=" -m multiport ! --dports $exclude"

    fi

    exclude=" ! --dport ${exclude//,/ ! --dport }"

  fi



  if ! iptables -t nat -A POSTROUTING -o "$VM_NET_DEV" -j MASQUERADE > /dev/null 2>&1; then