From edc501d4674dadc304d45a7e1c5b69e207eb8cd4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 4 Aug 2014 19:48:03 +0200 Subject: 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. --- src/resolve/resolved.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/resolve/resolved.c') 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); -- cgit v1.2.3-54-g00ecf