Commit 3808d6ab authored by Kroese's avatar Kroese Committed by GitHub
Browse files

Multiline errors

parent 83aa1af2

run/network.sh

+19 −21
Original line number Diff line number Diff line
@@ -28,11 +28,13 @@ configureDHCP() { 
  IP=$(ip address show dev "${VM_NET_DEV}" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)



  [[ "${DEBUG}" == [Yy1]* ]] && set -x



  # Create a macvlan network to allow for communication between the host and the VM guest

  { ip link add link "${VM_NET_DEV}" "${VM_NET_VLAN}" type macvlan mode bridge ; rc=$?; } || :



  if (( rc != 0 )); then

    echo -n "ERROR: Cannot create macvlan interface. Please make sure the network type is 'macvlan' and not 'ipvlan'."

    echo " And that the NET_ADMIN capability has been added to the container config: --cap-add NET_ADMIN" && exit 15

    echo "ERROR: Cannot create macvlan interface. Please make sure the network type is 'macvlan' and not 'ipvlan',"

    echo "ERROR: and that the NET_ADMIN capability has been added to the container config: --cap-add NET_ADMIN" && exit 15

  fi



  ip address add "${IP}" dev "${VM_NET_VLAN}"
@@ -44,18 +46,16 @@ configureDHCP() { 
  ip route add "${NETWORK}" dev "${VM_NET_VLAN}" metric 0

  ip route add default via "${GATEWAY}"

  

  # Create a macvtap network for the VM guest

  { ip link add link "${VM_NET_DEV}" name "${VM_NET_TAP}" address "${VM_NET_MAC}" type macvtap mode bridge ; rc=$?; } || :



  if (( rc != 0 )); then

    echo -n "ERROR: Capability NET_ADMIN has not been set most likely. Please add the "

    echo "following docker setting to your container: --cap-add NET_ADMIN" && exit 16

    echo "ERROR: Capability NET_ADMIN has not been set most likely. Please add the "

    echo "ERROR: following docker setting to your container: --cap-add NET_ADMIN" && exit 16

  fi



  ip link set "${VM_NET_TAP}" up



  ip address flush "${VM_NET_DEV}"

  ip address flush "${VM_NET_TAP}"



  { set +x; } 2>/dev/null



  TAP_NR=$(</sys/class/net/"${VM_NET_TAP}"/ifindex)
@@ -78,15 +78,15 @@ configureDHCP() { 
  { exec 30>>"$TAP_PATH"; rc=$?; } || :



  if (( rc != 0 )); then

    echo -n "ERROR: Cannot create TAP interface ($rc). Please add the following docker settings to your "

    echo "container: --device-cgroup-rule='c ${MAJOR}:* rwm' --device=/dev/vhost-net" && exit 21

    echo "ERROR: Cannot create TAP interface ($rc). Please add the following docker settings to your "

    echo "ERROR: container: --device-cgroup-rule='c ${MAJOR}:* rwm' --device=/dev/vhost-net" && exit 21

  fi



  { exec 40>>/dev/vhost-net; rc=$?; } || :



  if (( rc != 0 )); then

    echo -n "ERROR: VHOST can not be found ($rc). Please add the following "

    echo "docker setting to your container: --device=/dev/vhost-net" && exit 22

    echo "ERROR: VHOST can not be found ($rc). Please add the following "

    echo "ERROR: docker setting to your container: --device=/dev/vhost-net" && exit 22

  fi



  NET_OPTS="-netdev tap,id=hostnet0,vhost=on,vhostfd=40,fd=30"
@@ -98,12 +98,11 @@ configureNAT () { 
  [[ "${DEBUG}" == [Yy1]* ]] && set -x



  # Create bridge with static IP for the VM guest



  { ip link add dev dockerbridge type bridge ; rc=$?; } || :



  if (( rc != 0 )); then

    echo -n "ERROR: Capability NET_ADMIN has not been set most likely. Please add the "

    echo "following docker setting to your container: --cap-add NET_ADMIN" && exit 23

    echo "ERROR: Capability NET_ADMIN has not been set most likely. Please add the "

    echo "ERROR: following docker setting to your container: --cap-add NET_ADMIN" && exit 23

  fi



  ip address add ${VM_NET_IP%.*}.1/24 broadcast ${VM_NET_IP%.*}.255 dev dockerbridge
@@ -131,8 +130,7 @@ configureNAT () { 
  if [[ $(< /proc/sys/net/ipv4/ip_forward) -eq 0 ]]; then

    { sysctl -w net.ipv4.ip_forward=1 ; rc=$?; } || :

    if (( rc != 0 )); then

      echo -n "ERROR: IP forwarding is disabled ($rc). Please add the following "

      echo "docker setting to your container: --sysctl net.ipv4.ip_forward=1" && exit 24

      echo "ERROR: Please add the following docker setting to your container: --sysctl net.ipv4.ip_forward=1" && exit 24

    fi

  fi