twh_eastasia/virtual-dsm
1
0
Fork 0
mirror of https://github.com/vdsm/virtual-dsm.git synced 2025-02-24 21:40:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Bridge

Browse Source
This commit is contained in:
Kroese 2023-04-20 06:02:38 +02:00 committed by GitHub
parent 29391e59d2
commit 1644676b7e
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
run/network.sh
View File

@ -20,10 +20,13 @@ configureDHCP() {
# Create /dev/vhost-net # Create /dev/vhost-net
if [ ! -c /dev/vhost-net ]; then if [ ! -c /dev/vhost-net ]; then
mknod /dev/vhost-net c 10 238 mknod /dev/vhost-net c 10 238
chmod 666 /dev/vhost-net chmod 660 /dev/vhost-net
fi fi
[ ! -c /dev/vhost-net ] && echo "Error: VHOST interface not available..." && exit 85 if [ ! -c /dev/vhost-net ]; then
echo -n "Error: VHOST interface not available. Please add the following "
echo "docker variable to your container: --device=/dev/vhost-net" && exit 85
fi
VM_NET_TAP="_VmMacvtap" VM_NET_TAP="_VmMacvtap"
echo "Info: Retrieving IP via DHCP using MAC ${VM_NET_MAC}..." echo "Info: Retrieving IP via DHCP using MAC ${VM_NET_MAC}..."
@ -62,11 +65,11 @@ configureDHCP() {
fi fi
if ! exec 30>>$TAP_PATH; then if ! exec 30>>$TAP_PATH; then
echo "ERROR: Please add the following docker variable to your container: --device-cgroup-rule='c ${MAJOR}:* rwm'" && exit 21 echo "ERROR: Please add the following docker variables to your container: --device=/dev/vhost-net --device-cgroup-rule='c ${MAJOR}:* rwm'" && exit 21
fi fi
if ! exec 40>>/dev/vhost-net; then if ! exec 40>>/dev/vhost-net; then
echo "ERROR: Cannot find vhost!" && exit 22 echo "ERROR: VHOST can not be found. Please add the following docker variable to your container: --device=/dev/vhost-net" && exit 22
fi fi
NET_OPTS="-netdev tap,id=hostnet0,vhost=on,vhostfd=40,fd=30" NET_OPTS="-netdev tap,id=hostnet0,vhost=on,vhostfd=40,fd=30"
@ -157,12 +160,17 @@ update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy > /dev/null
GATEWAY=$(ip r | grep default | awk '{print $3}') GATEWAY=$(ip r | grep default | awk '{print $3}')
#if [[ "$GATEWAY" == "172."* ]]; then if [[ "$GATEWAY" == "172."* ]]; then
# Configuration for static IP # Bridge network
#configureNAT configureNAT
#else else
# Configuration for DHCP IP if [ "$DHCP" = "Y" ]; then
configureDHCP # Configuration for DHCP IP
#fi configureDHCP
else
# Configuration for static IP
configureNAT
fi
fi
NET_OPTS="${NET_OPTS} -device virtio-net-pci,romfile=,netdev=hostnet0,mac=${VM_NET_MAC},id=net0" NET_OPTS="${NET_OPTS} -device virtio-net-pci,romfile=,netdev=hostnet0,mac=${VM_NET_MAC},id=net0"