fix: Detect macvlan

This commit is contained in:
Kroese 2025-10-07 04:13:01 +02:00 committed by GitHub
parent c0442bafa3
commit dc906e08d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -11,6 +11,7 @@ error () { printf "%b%s%b" "\E[1;31m " "ERROR: $1" "\E[0m\n" >&2; }
file="/run/shm/dsm.url"
info="/run/shm/msg.html"
driver="/run/shm/qemu.nic"
page="/run/shm/index.html"
address="/run/shm/qemu.ip"
shutdown="/run/shm/qemu.end"
@ -56,11 +57,7 @@ do
(( rc != 0 )) && error "$jq_err $rc ( $json )" && continue
[[ "$ip" == "null" ]] && error "$resp_err $json" && continue
if [ -z "$ip" ]; then
[[ "$DHCP" == [Yy1]* ]] && continue
ip="20.20.20.21"
fi
[ -z "$ip" ] && continue
echo "$ip:$port" > $file
done
@ -69,7 +66,7 @@ done
location=$(<"$file")
if [[ "$location" != "20.20"* ]]; then
if [[ "$DHCP" == [Yy1]* ]]; then
msg="http://$location"
title="<title>Virtual DSM</title>"
@ -88,10 +85,11 @@ if [[ "$location" != "20.20"* ]]; then
else
nic=$(<"$driver")
ip=$(<"$address")
port="${location##*:}"
if [[ "$ip" == "172."* ]]; then
if [[ "${nic,,}" != "macvlan" ]]; then
msg="port $port"
else
msg="http://$ip:$port"