1 From 77607cbea0ad0f876dfb79c8b2c121ee400d57d0 Mon Sep 17 00:00:00 2001
2 From: Simon Kelley <simon@thekelleys.org.uk>
3 Date: Thu, 10 Sep 2015 23:08:43 +0100
4 Subject: [PATCH] Respect the --no-resolv flag in inotify code.
8 debian/changelog | 6 ++++++
10 3 files changed, 15 insertions(+), 1 deletion(-)
12 diff --git a/CHANGELOG b/CHANGELOG
13 index bbc2834..d6e309f 100644
16 @@ -7,8 +7,13 @@ version 2.76
18 Enhance --add-subnet to allow arbitrary subnet addresses.
19 Thanks to Ed Barsley for the patch.
21 + Respect the --no-resolv flag in inotify code. Fixes bug
22 + which caused dnsmasq to fail to start if a resolv-file
23 + was a dangling symbolic link, even of --no-resolv set.
24 + Thanks to Alexander Kurtz for spotting the problem.
29 Fix reversion on 2.74 which caused 100% CPU use when a
30 dhcp-script is configured. Thanks to Adrian Davey for
31 diff --git a/src/inotify.c b/src/inotify.c
32 index 52d412f..ef05c58 100644
35 @@ -90,6 +90,9 @@ void inotify_dnsmasq_init()
37 if (daemon->inotifyfd == -1)
38 die(_("failed to create inotify: %s"), NULL, EC_MISC);
40 + if (option_bool(OPT_NO_RESOLV))
43 for (res = daemon->resolv_files; res; res = res->next)