diff --git a/run/network.sh b/run/network.sh index 3d56cab..1a7cb2b 100644 --- a/run/network.sh +++ b/run/network.sh @@ -20,7 +20,7 @@ set -eu configureDHCP() { - VM_NET_VLAN="vlan" + VM_NET_VLAN="${VM_NET_TAP}_vlan" GATEWAY=$(ip r | grep default | awk '{print $3}') NETWORK=$(ip -o route | grep "${VM_NET_DEV}" | grep -v default | awk '{print $1}') IP=$(ip address show dev "${VM_NET_DEV}" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/) @@ -54,18 +54,6 @@ configureDHCP() { ip address flush "${VM_NET_DEV}" ip address flush "${VM_NET_TAP}" - echo "INFO: Acquiring an IP address via DHCP using MAC address ${VM_NET_MAC}..." - - DHCP_IP=$(dhclient -v "${VM_NET_TAP}" 2>&1 | grep ^bound | cut -d' ' -f3) - - if [[ "${DHCP_IP}" == [0-9.]* ]]; then - echo "INFO: Successfully acquired IP ${DHCP_IP} from the DHCP server..." - else - echo "ERROR: Cannot acquire an IP address from the DHCP server" && exit 17 - fi - - ip address flush "${VM_NET_TAP}" - { set +x; } 2>/dev/null TAP_NR=$(