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

fix: Use gateway MAC for passt (#874)

parent 374b4d90

src/network.sh

+9 −11
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ configurePasst() { 
  PASST_OPTS+=" -t $exclude"

  PASST_OPTS+=" -u $exclude"

  PASST_OPTS+=" -H $VM_NET_HOST"

  PASST_OPTS+=" -M $VM_NET_MAC"

  PASST_OPTS+=" -M $GATEWAY_MAC"

  PASST_OPTS+=" -P /var/run/passt.pid"

  PASST_OPTS+=" -l $log"

  PASST_OPTS+=" -q"
@@ -361,7 +361,7 @@ configurePasst() { 
  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 ! $PASST ${PASST_OPTS:+ $PASST_OPTS}; then

  if ! $PASST ${PASST_OPTS:+ $PASST_OPTS} >/dev/null 2>&1; then

    local msg="Failed to start passt, reason: $?"

    [ -f "$log" ] && cat "$log"

    error "$msg"
@@ -370,6 +370,10 @@ configurePasst() { 


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

    tail -fn +0 "$log" &

  else

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

      cat "$log" && echo ""

    fi

  fi



  NET_OPTS="-netdev stream,id=hostnet0,server=off,addr.type=unix,addr.path=/tmp/passt_1.socket"
@@ -449,8 +453,6 @@ configureNAT() { 
    fi

  fi



  GATEWAY_MAC=$(echo "$VM_NET_MAC" | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/')



  if ! ip link set dev "$VM_NET_TAP" address "$GATEWAY_MAC"; then

    warn "failed to set gateway MAC address.."

  fi
@@ -714,6 +716,8 @@ getInfo() { 
    error "Invalid MAC address: '$VM_NET_MAC', should be 12 or 17 digits long!" && exit 28

  fi



  GATEWAY_MAC=$(echo "$VM_NET_MAC" | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/')



  if [[ "$PODMAN" == [Yy1]* && "$DHCP" != [Yy1]* ]]; then

    if [ -z "$NETWORK" ] || [[ "${NETWORK^^}" == "Y" ]]; then

      # By default Podman has no permissions for NAT networking
@@ -774,13 +778,7 @@ else 


  esac



  if [[ "${NETWORK,,}" == "user"* ]]; then

    if [[ "${BOOT_MODE:-}" != "windows_legacy" ]]; then

      NETWORK="passt"

    else

      NETWORK="slirp"

    fi

  fi

  [[ "${NETWORK,,}" == "user"* ]] && NETWORK="passt"



  case "${NETWORK,,}" in

    "nat" | "tap" | "tun" | "tuntap" | "y" ) ;;