Merge ~paelzer/ubuntu/+source/avahi:lp-1752411-bionic into ubuntu/+source/avahi:ubuntu/bionic-devel

Proposed by Christian Ehrhardt 
Status: Merged
Approved by: Christian Ehrhardt 
Approved revision: 8f526c09b19753b51828158b756b2ad36cd8b349
Merged at revision: 8f526c09b19753b51828158b756b2ad36cd8b349
Proposed branch: ~paelzer/ubuntu/+source/avahi:lp-1752411-bionic
Merge into: ubuntu/+source/avahi:ubuntu/bionic-devel
Diff against target: 32 lines (+12/-1)
2 files modified
debian/avahi-daemon-check-dns.sh (+2/-1)
debian/changelog (+10/-0)
Reviewer Review Type Date Requested Status
Andreas Hasenack (community) Approve
Canonical Server Team Pending
Ubuntu Server Dev import team Pending
Review via email: mp+353846@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

+1

review: Approve
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/avahi
 * [new tag] upload/0.7-3.1ubuntu1.1 -> upload/0.7-3.1ubuntu1.1

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading avahi_0.7-3.1ubuntu1.1.dsc: done.
  Uploading avahi_0.7-3.1ubuntu1.1.debian.tar.xz: done.
  Uploading avahi_0.7-3.1ubuntu1.1_source.buildinfo: done.
  Uploading avahi_0.7-3.1ubuntu1.1_source.changes: done.
Successfully uploaded packages.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/avahi-daemon-check-dns.sh b/debian/avahi-daemon-check-dns.sh
2index 7f92e9d..bd99d38 100755
3--- a/debian/avahi-daemon-check-dns.sh
4+++ b/debian/avahi-daemon-check-dns.sh
5@@ -73,7 +73,8 @@ dns_has_local() {
6 fi
7 fi
8
9- OUT=`LC_ALL=C host -t soa local. 2>&1`
10+ # Use timeout when calling host as workaround for LP: #1752411
11+ OUT=`LC_ALL=C timeout 5 host -t soa local. 2>&1`
12 if [ $? -eq 0 ] ; then
13 if echo "$OUT" | egrep -vq 'has no|not found'; then
14 return 0
15diff --git a/debian/changelog b/debian/changelog
16index d3e26e5..bd07b2f 100644
17--- a/debian/changelog
18+++ b/debian/changelog
19@@ -1,3 +1,13 @@
20+avahi (0.7-3.1ubuntu1.1) bionic; urgency=medium
21+
22+ [ Trent Lloyd ]
23+ * debian/avahi-daemon-check-dns.sh: On some hardware, the 'host'
24+ command gets stuck and does not timeout as it should leaving this script
25+ and boot-up hanging indefinitely. Launch host with 'timeout' to kill it
26+ after 5 seconds in these cases as a workaround. (LP: #1752411)
27+
28+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 28 Aug 2018 11:37:21 +0200
29+
30 avahi (0.7-3.1ubuntu1) bionic; urgency=medium
31
32 * Merge from Debian unstable. Remaining changes:

Subscribers

People subscribed via source and target branches