summaryrefslogtreecommitdiff
path: root/src/resolve/resolved.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-08-04 19:48:03 +0200
committerLennart Poettering <lennart@poettering.net>2014-08-04 19:48:03 +0200
commitedc501d4674dadc304d45a7e1c5b69e207eb8cd4 (patch)
treeaf6a11f1a59a2d5802db6052a2483284328ee201 /src/resolve/resolved.c
parent4f758c23981342f1fb838f4b2630812eb89a3faa (diff)
resolved: when there's already somebody listening on the LLMNR ports, simple disable LLMNR and warn, but continue
This allows us to run resolved inside an nspawn container that shares the network namespace with the host, if there's already an instance running.
Diffstat (limited to 'src/resolve/resolved.c')
-rw-r--r--src/resolve/resolved.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
index 900a36d8f0..892bb51386 100644
--- a/src/resolve/resolved.c
+++ b/src/resolve/resolved.c
@@ -75,6 +75,12 @@ int main(int argc, char *argv[]) {
if (r < 0)
log_warning("Failed to parse configuration file: %s", strerror(-r));
+ r = manager_start(m);
+ if (r < 0) {
+ log_error("Failed to start manager: %s", strerror(-r));
+ goto finish;
+ }
+
/* Write finish default resolv.conf to avoid a dangling
* symlink */
r = manager_write_resolv_conf(m);