diff --git a/run/network.sh b/run/network.sh index a39d185..2acfd7f 100644 --- a/run/network.sh +++ b/run/network.sh @@ -25,7 +25,7 @@ configureDHCP() { 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/) - ip l add link "${VM_NET_DEV}" "${VM_NET_VLAN}" type macvlan mode bridge + ip link add link "${VM_NET_DEV}" "${VM_NET_VLAN}" type macvlan mode bridge ip address add "${IP}" dev "${VM_NET_VLAN}" ip link set dev "${VM_NET_VLAN}" up @@ -37,8 +37,8 @@ configureDHCP() { echo "INFO: Acquiring an IP address via DHCP using MAC address ${VM_NET_MAC}..." - ip l add link "${VM_NET_DEV}" name "${VM_NET_TAP}" address "${VM_NET_MAC}" type macvtap mode bridge || true - ip l set "${VM_NET_TAP}" up + ip link add link "${VM_NET_DEV}" name "${VM_NET_TAP}" address "${VM_NET_MAC}" type macvtap mode bridge || true + ip link set "${VM_NET_TAP}" up ip a flush "${VM_NET_DEV}" ip a flush "${VM_NET_TAP}" @@ -51,7 +51,7 @@ configureDHCP() { echo "ERROR: Cannot acquire an IP address from the DHCP server" && exit 16 fi - ip a flush "${VM_NET_TAP}" + ip address flush "${VM_NET_TAP}" TAP_NR=$(>"$TAP_PATH"; then - echo -n "ERROR: Please add the following docker variables to your container: " + echo -n "ERROR: Please add the following docker settings to your container: " echo "--device=/dev/vhost-net --device-cgroup-rule='c ${MAJOR}:* rwm'" && exit 21 fi @@ -83,8 +83,8 @@ configureDHCP() { fi if ! exec 40>>/dev/vhost-net; then - echo -n "ERROR: VHOST can not be found. Please add the following docker " - echo "variable to your container: --device=/dev/vhost-net" && exit 22 + echo -n "ERROR: VHOST can not be found. Please add the following " + echo "docker setting to your container: --device=/dev/vhost-net" && exit 22 fi # Store IP for Docker healthcheck @@ -98,7 +98,12 @@ configureNAT () { VM_NET_IP='20.20.20.21' #Create bridge with static IP for the VM guest - ip link add dev dockerbridge type bridge + + if ! ip link add dev dockerbridge type bridge > /dev/null 2>&1 ; then + echo -n "ERROR: Capability NET_ADMIN has not been set. Please add the " + echo "following docker setting to your container: --cap-add NET_ADMIN" && exit 23 + fi + ip addr add ${VM_NET_IP%.*}.1/24 broadcast ${VM_NET_IP%.*}.255 dev dockerbridge ip link set dockerbridge up