zishuo/qemu-docker
1
0
Fork 0
mirror of https://github.com/qemus/qemu-docker.git synced 2025-12-24 13:38:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Surpress dnsmasq error in rootless mode (#984)

Browse Source
This commit is contained in:
Kroese
2025-11-22 04:15:48 +01:00
committed by GitHub
parent f0d29a183b
commit 9895093525
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/network.sh
View File

@@ -173,8 +173,11 @@ configureDNS() {
if ! $DNSMASQ ${arguments:+ $arguments}; then
local msg="Failed to start Dnsmasq, reason: $?"
[ -f "$log" ] && cat "$log"
error "$msg"
if [[ "${NETWORK,,}" == "slirp" || "${NETWORK,,}" == "passt" || "$ROOTLESS" != [Yy1]* || "$DEBUG" == [Yy1]* ]]; then
[ -f "$log" ] && [ -s "$log" ] && cat "$log"
error "$msg"
fi
return 1
fi
@@ -420,7 +423,7 @@ configurePasst() {
{ $PASST ${PASST_OPTS:+ $PASST_OPTS}; rc=$?; } || :
if (( rc != 0 )); then
[ -f "$log" ] && cat "$log"
[ -f "$log" ] && [ -s "$log" ] && cat "$log"
warn "failed to start passt ($rc), falling back to slirp networking!"
configureSlirp && return 0 || return 1
fi
@@ -431,7 +434,7 @@ configurePasst() {
tail -fn +0 "$log" --pid=$$ &
else
if [[ "$DEBUG" == [Yy1]* ]]; then
[ -f "$log" ] && cat "$log" && echo ""
[ -f "$log" ] && [ -s "$log" ] && cat "$log" && echo ""
fi
fi
@@ -838,7 +841,7 @@ else
case "${NETWORK,,}" in
"passt" | "slirp" | "user"* ) ;;
"tap" | "tun" | "tuntap" | "y" )
"tap" | "tun" | "tuntap" | "y" | "" )
# Configure tap interface
if ! configureNAT; then
@@ -857,7 +860,7 @@ else
esac
case "${NETWORK,,}" in
"tap" | "tun" | "tuntap" | "y" ) ;;
"tap" | "tun" | "tuntap" | "y" | "" ) ;;
"passt" | "user"* )
# Configure for user-mode networking (passt)