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

Simplify network code

Browse Source
This commit is contained in:
Kroese 2023-04-09 16:30:17 +02:00 committed by GitHub
parent 6e7091d93f
commit e4031ae566
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
network.sh
View File

@ -15,9 +15,9 @@ set -eu
# ###################################### # ######################################
setupLocalDhcp () { setupLocalDhcp () {
CIDR="24"
MAC="$1"
IP="$2" IP="$2"
MAC="$1"
CIDR="24"
HOSTNAME="VirtualDSM" HOSTNAME="VirtualDSM"
# dnsmasq configuration: # dnsmasq configuration:
DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-range=$IP,$IP --dhcp-host=$MAC,,$IP,$HOSTNAME,infinite --dhcp-option=option:netmask,255.255.255.0" DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-range=$IP,$IP --dhcp-host=$MAC,,$IP,$HOSTNAME,infinite --dhcp-option=option:netmask,255.255.255.0"
@ -75,9 +75,7 @@ searchdomains=$(grep '^search' /etc/resolv.conf | sed 's/search //' | sed 's/ /,
domainname=$(echo $searchdomains | awk -F"," '{print $1}') domainname=$(echo $searchdomains | awk -F"," '{print $1}')
for nameserver in "${nameservers[@]}"; do for nameserver in "${nameservers[@]}"; do
if [[ $nameserver =~ .*:.* ]]; then if [ ! [ $nameserver =~ .*:.* ] ]; then
echo "Skipping IPv6 nameserver: $nameserver"
else
[[ -z $DNS_SERVERS ]] && DNS_SERVERS=$nameserver || DNS_SERVERS="$DNS_SERVERS,$nameserver" [[ -z $DNS_SERVERS ]] && DNS_SERVERS=$nameserver || DNS_SERVERS="$DNS_SERVERS,$nameserver"
fi fi
done done