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

DNS server fallback

Browse Source
This commit is contained in:
Kroese 2023-04-14 01:23:09 +02:00
parent fbb51b61c8
commit 3677b1e4ce
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
network.sh
View File

@ -2,8 +2,8 @@
set -eu set -eu
: ${VM_NET_TAP:=''} : ${VM_NET_TAP:=''}
: ${VM_NET_MAC:=''}
: ${VM_NET_IP:='20.20.20.21'} : ${VM_NET_IP:='20.20.20.21'}
: ${VM_NET_MAC:='02:11:32:AA:BB:CC'}
: ${DNS_SERVERS:=''} : ${DNS_SERVERS:=''}
: ${DNSMASQ:='/usr/sbin/dnsmasq'} : ${DNSMASQ:='/usr/sbin/dnsmasq'}
@ -14,18 +14,6 @@ set -eu
# Functions # Functions
# ###################################### # ######################################
setupLocalDhcp () {
IP="$2"
MAC="$1"
CIDR="24"
HOSTNAME="VirtualDSM"
# dnsmasq configuration:
DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-range=$IP,$IP --dhcp-host=$MAC,,$IP,$HOSTNAME,infinite --dhcp-option=option:netmask,255.255.255.0"
# Create lease file for faster resolve
echo "0 $MAC $IP $HOSTNAME 01:${MAC}" > /var/lib/misc/dnsmasq.leases
chmod 644 /var/lib/misc/dnsmasq.leases
}
# Setup macvtap device to connect later the VM and setup a new macvlan device to connect the host machine to the network # Setup macvtap device to connect later the VM and setup a new macvlan device to connect the host machine to the network
configureNatNetworks () { configureNatNetworks () {
@ -46,7 +34,15 @@ configureNatNetworks () {
#Enable port forwarding flag #Enable port forwarding flag
[[ $(< /proc/sys/net/ipv4/ip_forward) -eq 0 ]] && sysctl -w net.ipv4.ip_forward=1 [[ $(< /proc/sys/net/ipv4/ip_forward) -eq 0 ]] && sysctl -w net.ipv4.ip_forward=1
setupLocalDhcp $VM_NET_MAC $VM_NET_IP CIDR="24"
HOSTNAME="VirtualDSM"
# dnsmasq configuration:
DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-range=$VM_NET_IP,$VM_NET_IP --dhcp-host=$VM_NET_MAC,,$VM_NET_IP,$HOSTNAME,infinite --dhcp-option=option:netmask,255.255.255.0"
# Create lease file for faster resolve
echo "0 $VM_NET_MAC $VM_NET_IP $HOSTNAME 01:${VM_NET_MAC}" > /var/lib/misc/dnsmasq.leases
chmod 644 /var/lib/misc/dnsmasq.leases
} }
# ###################################### # ######################################
@ -61,14 +57,6 @@ if [ ! -c /dev/net/tun ]; then
fi fi
[ ! -c /dev/net/tun ] && echo "Error: TUN network interface not available..." && exit 85 [ ! -c /dev/net/tun ] && echo "Error: TUN network interface not available..." && exit 85
[ ! -d "$IMG" ] && echo "Storage folder (${IMG}) not found!" && exit 86
#If environment variabele not set fall back to file
if [ -z "$VM_NET_MAC" ]; then
FILE="${IMG}/guest.mac"
[ ! -f "$FILE" ] && echo "00:11:32:2C:A7:85" > "$FILE"
VM_NET_MAC=$(cat "${FILE}")
fi
update-alternatives --set iptables /usr/sbin/iptables-legacy > /dev/null update-alternatives --set iptables /usr/sbin/iptables-legacy > /dev/null
update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy > /dev/null update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy > /dev/null
@ -88,17 +76,28 @@ for nameserver in "${nameservers[@]}"; do
fi fi
done done
if [ -z $DNS_SERVERS ]; then
DNS_SERVERS="1.1.1.1"
else
COMMAS=${DNS_SERVERS//[^,]/}
COMMAS=${#COMMAS}
(($COMMAS < 1)) && DNS_SERVERS="$DNS_SERVERS,1.1.1.1"
fi
DNSMASQ_OPTS="$DNSMASQ_OPTS \ DNSMASQ_OPTS="$DNSMASQ_OPTS \
--dhcp-option=option:dns-server,$DNS_SERVERS \ --dhcp-option=option:dns-server,$DNS_SERVERS \
--dhcp-option=option:router,${VM_NET_IP%.*}.1 \ --dhcp-option=option:router,${VM_NET_IP%.*}.1"
--dhcp-option=option:domain-search,$searchdomains \
--dhcp-option=option:domain-name,$domainname"
if [ ! -z "$searchdomains" -a "$searchdomains" != "." ]; then
DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-option=option:domain-search,$searchdomains"
DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-option=option:domain-name,$domainname"
else
[[ -z $(hostname -d) ]] || DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-option=option:domain-name,$(hostname -d)" [[ -z $(hostname -d) ]] || DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-option=option:domain-name,$(hostname -d)"
fi
$DNSMASQ $DNSMASQ_OPTS $DNSMASQ $DNSMASQ_OPTS
KVM_NET_OPTS="${KVM_NET_OPTS} -device virtio-net-pci,netdev=hostnet0,mac=${VM_NET_MAC},id=net0" KVM_NET_OPTS="${KVM_NET_OPTS} -device virtio-net-pci,romfile=,netdev=hostnet0,mac=${VM_NET_MAC},id=net0"
# Hack for guest VMs complaining about "bad udp checksums in 5 packets" # Hack for guest VMs complaining about "bad udp checksums in 5 packets"
iptables -A POSTROUTING -t mangle -p udp --dport bootpc -j CHECKSUM --checksum-fill iptables -A POSTROUTING -t mangle -p udp --dport bootpc -j CHECKSUM --checksum-fill