diff options
| author | Tobias K <6317548+theCalcaholic@users.noreply.github.com> | 2022-07-17 18:18:42 +0300 |
|---|---|---|
| committer | Tobias K <6317548+theCalcaholic@users.noreply.github.com> | 2022-07-17 18:18:42 +0300 |
| commit | 0ce9d1175bb3ee4b944c0339c110c5c6f8448ce1 (patch) | |
| tree | 5f8d83f399b4f1c5c8531f1f5d69f06772e75a1f | |
| parent | 2934a7a3747810c7447f0afc51baa6a2dc917fef (diff) | |
dnsmasq.sh: Simplify dnsmasq workaround
| -rw-r--r-- | bin/ncp/NETWORKING/dnsmasq.sh | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/bin/ncp/NETWORKING/dnsmasq.sh b/bin/ncp/NETWORKING/dnsmasq.sh index fec4712d..ced7ae75 100644 --- a/bin/ncp/NETWORKING/dnsmasq.sh +++ b/bin/ncp/NETWORKING/dnsmasq.sh @@ -14,17 +14,9 @@ install() set -x apt-get update apt-get install --no-install-recommends -y dnsmasq - rc=0 - service dnsmasq status > /dev/null 2>&1 || rc=$? - ! is_docker && [[ $rc -eq 3 ]] && service systemd-resolved status && { - echo "Applying workaround for dnsmasq bug (compare issue #1446)" - service systemd-resolved stop - service dnsmasq start - service dnsmasq stop - } - update-rc.d dnsmasq disable || rm /etc/systemd/system/multi-user.target.wants/dnsmasq.service service dnsmasq stop - service systemd-resolved start || true + ! is_docker && service systemd-resolved start || true + update-rc.d dnsmasq disable || rm /etc/systemd/system/multi-user.target.wants/dnsmasq.service [[ "$DOCKERBUILD" == 1 ]] && { cat > /etc/services-available.d/100dnsmasq <<EOF |