diff options
| author | Tobias K <6317548+theCalcaholic@users.noreply.github.com> | 2022-07-17 20:38:26 +0300 |
|---|---|---|
| committer | Tobias K <6317548+theCalcaholic@users.noreply.github.com> | 2022-07-17 20:38:26 +0300 |
| commit | 82beb6eeaf7b1c1b1e2cbed4ebaf733328fcaf7b (patch) | |
| tree | 81886a92ae9027b4a45cf3612d39beaa6814bde5 /bin | |
| parent | 99cc9e610ce61a99ced45ce178c2e259406b0a0f (diff) | |
dnsmasq.sh: Revert dnsmasq workaround
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/ncp/NETWORKING/dnsmasq.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/bin/ncp/NETWORKING/dnsmasq.sh b/bin/ncp/NETWORKING/dnsmasq.sh index fa1c2d21..058e4dcd 100644 --- a/bin/ncp/NETWORKING/dnsmasq.sh +++ b/bin/ncp/NETWORKING/dnsmasq.sh @@ -14,11 +14,16 @@ install() set -x apt-get update apt-get install --no-install-recommends -y dnsmasq - service dnsmasq stop - ! is_docker && { - service systemd-resolved start || true - systemctl enable systemd-resolved || echo "WARN: systemd-resolved could not be enabled. This might cause networking issues!" + rc=0 + service dnsmasq status > /dev/null 2>&1 || rc=$? + ! is_docker && [[ $rc -eq 3 ]] && { + echo "Applying workaround for dnsmasq bug (compare issue #1446)" + service systemd-resolved stop || true + service dnsmasq start + service dnsmasq status } + + service dnsmasq stop update-rc.d dnsmasq disable || rm /etc/systemd/system/multi-user.target.wants/dnsmasq.service [[ "$DOCKERBUILD" == 1 ]] && { |