diff options
| author | Tobias K <6317548+theCalcaholic@users.noreply.github.com> | 2022-03-26 23:11:24 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2022-03-31 02:19:50 +0300 |
| commit | 99a3c45592abc4937b12f2f93b0e81a6aa3fd97d (patch) | |
| tree | cdedad7e7e1b0a3e035a8d0632c9fbdc9d2b1332 | |
| parent | cd98b50da7b3f7f840d264e87c51533fd1d10f4c (diff) | |
dnsmasq.sh: Workaround dnsmasq startup failure bugv1.46.10
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
| -rw-r--r-- | bin/ncp/NETWORKING/dnsmasq.sh | 8 | ||||
| -rw-r--r-- | changelog.md | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/bin/ncp/NETWORKING/dnsmasq.sh b/bin/ncp/NETWORKING/dnsmasq.sh index 587dc4e3..368403e9 100644 --- a/bin/ncp/NETWORKING/dnsmasq.sh +++ b/bin/ncp/NETWORKING/dnsmasq.sh @@ -13,7 +13,15 @@ install() { apt-get update apt-get install --no-install-recommends -y dnsmasq + rc=0 + service dnsmasq status > /dev/null 2>&1 || rc=$? + [[ $rc -eq 3 ]] && { + echo "Applying workaround for dnsmasq bug (compare issue #1446)" + service systemd-resolved stop + service dnsmasq start + } update-rc.d dnsmasq disable + service dnsmasq stop [[ "$DOCKERBUILD" == 1 ]] && { cat > /etc/services-available.d/100dnsmasq <<EOF diff --git a/changelog.md b/changelog.md index 1d175780..6c8e9be9 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,7 @@ -[v1.46.9](https://github.com/nextcloud/nextcloudpi/commit/db56128) (2022-03-07) docker: adjust PHP version in apache config +[v1.46.10](https://github.com/nextcloud/nextcloudpi/commit/c076cb3) (2022-03-26) dnsmasq.sh: Workaround dnsmasq startup failure bug + +[v1.46.9](https://github.com/nextcloud/nextcloudpi/commit/cd98b50) (2022-03-07) docker: adjust PHP version in apache config [v1.46.8 ](https://github.com/nextcloud/nextcloudpi/commit/21b7fe7) (2022-03-04) SSH: cannot check for default password because of Debian bug #1003151 |