8000 Observe resolv.conf changes by awh · Pull Request #2378 · weaveworks/weave · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Jun 20, 2024. It is now read-only.

Observe resolv.conf changes #2378

Merged
merged 1 commit into from
Jun 16, 2016
Merged

Observe resolv.conf changes #2378

merged 1 commit into from
Jun 16, 2016

Conversation

awh
Copy link
Contributor
@awh awh commented Jun 16, 2016

Fixes #2364.

@awh awh added this to the 1.6.0 milestone Jun 16, 2016
awh
awh reviewed Jun 16, 2016
View reviewed changes
weave
8000
@@ -1625,13 +1628,16 @@ launch_router() {
--label=weavevolumes $WEAVEDB_IMAGE >/dev/null
fi

RESOLV_CONF_DIR=$(dirname $(chroot $HOST_ROOT readlink -f /etc/resolv.conf))

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

@rade rade assigned awh Jun 16, 2016
@awh awh force-pushed the issues/2364-observe-resolv-conf branch from c520fd5 to 0269aac Compare June 16, 2016 14:18
rade
rade reviewed Jun 16, 2016
View reviewed changes
nameserver/dns.go
@@ -96,6 +103,29 @@ func (d *DNSServer) listen(address string) error {
return nil
}

func (d *DNSServer) upstreamConfig() *dns.ClientConfig {

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

@awh awh force-pushed the issues/2364-observe-resolv-conf branch 2 times, most recently from 1a2e65d to 43a6330 Compare June 16, 2016 15:51
@awh awh force-pushed the issues/2364-observe-resolv-conf branch from 43a6330 to 27e7ec0 Compare June 16, 2016 15:55
@rade rade merged commit 979df93 into master Jun 16, 2016
@awh awh mentioned this pull request Jul 12, 2016
Merged
@bboreham bboreham deleted the issues/2364-observe-resolv-conf branch November 9, 2016 17:23
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@awh awh

Labels
None yet
Projects
None yet
Milestone
1.6.0
Development

Successfully merging this pull request may close these issues.
2 participants
@awh @rade
0