mirrors/virtual-dsm
1
0
Fork 0
mirror of https://github.com/vdsm/virtual-dsm.git synced 2026-08-28 20:06:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Network interface detection (#1164)

Browse Source
This commit is contained in:
Kroese
2026-05-29 14:34:34 +02:00
committed by GitHub
parent 48ef47b85b
commit 819dd29025
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network.sh
+4 -7
View File
@@ -462,7 +462,7 @@ configureNAT() {
fi
fi
local ip base gateway
local ip base gateway exclude
base=$(echo "$IP" | sed -r 's/([^.]*.){2}//')
if [[ "$IP" != "172.30."* ]]; then
@@ -675,7 +675,7 @@ getInfo() {
[ -d "/sys/class/net/net2" ] && VM_NET_DEV="net2"
[ -d "/sys/class/net/net3" ] && VM_NET_DEV="net3"
# Automatically detect the default network interface
[ -z "$VM_NET_DEV" ] && VM_NET_DEV=$(awk '$2 == 00000000 { print $1 }' /proc/net/route)
[ -z "$VM_NET_DEV" ] && VM_NET_DEV=$(awk '$2 == 00000000 { print $1; exit }' /proc/net/route)
[ -z "$VM_NET_DEV" ] && VM_NET_DEV="eth0"
fi
@@ -685,11 +685,8 @@ getInfo() {
fi
GATEWAY=$(ip route list dev "$VM_NET_DEV" | awk ' /^default/ {print $3}' | head -n 1)
{ IP=$(ip address show dev "$VM_NET_DEV" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/ | head -n 1); rc=$?; } 2>/dev/null || :
if [ -z "$IP" ] || (( rc != 0 )); then
[[ "$DHCP" != [Yy1]* ]] && error "Could not determine container IPv4 address!" && exit 26
fi
{ IP=$(ip address show dev "$VM_NET_DEV" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/ | head -n 1); } 2>/dev/null || :
[ -z "$IP" ] && [[ "$DHCP" != [Yy1]* ]] && error "Could not determine container IPv4 address!" && exit 26
IP6=""
# shellcheck disable=SC2143