diff options
| author | Tobias Knöppler <6317548+theCalcaholic@users.noreply.github.com> | 2022-07-20 01:25:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-20 01:25:19 +0300 |
| commit | 7af7582fffe521d166fc6bcf6999602a29131337 (patch) | |
| tree | 6b5f5cbe38520ebbb643beba3935be304944285e /bin/ncp/NETWORKING/dnsmasq.sh | |
| parent | 9a142d13d71b4804d99e779e2fc2e2fdd11319d3 (diff) | |
Create releases from GH workflow (#1507)
- Implement lxd-build GH workflow
- Implement GH workflow for building armbian and raspberry pi images
- Implement release GH workflow
Diffstat (limited to 'bin/ncp/NETWORKING/dnsmasq.sh')
| -rw-r--r-- | bin/ncp/NETWORKING/dnsmasq.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/ncp/NETWORKING/dnsmasq.sh b/bin/ncp/NETWORKING/dnsmasq.sh index c778050a..9e5ce3a5 100644 --- a/bin/ncp/NETWORKING/dnsmasq.sh +++ b/bin/ncp/NETWORKING/dnsmasq.sh @@ -16,7 +16,7 @@ install() apt-get install --no-install-recommends -y dnsmasq rc=0 service dnsmasq status > /dev/null 2>&1 || rc=$? - ! is_docker && [[ $rc -eq 3 ]] && [[ "$INIT_SYSTEM" != "chroot" ]] && { + ! is_docker && [[ $rc -eq 3 ]] && ! [[ "$INIT_SYSTEM" =~ ^("chroot"|"unknown")$ ]] && { echo "Applying workaround for dnsmasq bug (compare issue #1446)" service systemd-resolved stop || true service dnsmasq start @@ -24,6 +24,7 @@ install() } service dnsmasq stop + [[ "$INIT_SYSTEM" == "systemd" ]] && service systemd-resolved start || true update-rc.d dnsmasq disable || rm /etc/systemd/system/multi-user.target.wants/dnsmasq.service [[ "$DOCKERBUILD" == 1 ]] && { |