aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMartin Fuchs <martin.fuchs@trendchiller.com>2011-09-30 22:50:05 +0200
committerMartin Fuchs <martin.fuchs@trendchiller.com>2011-09-30 22:50:05 +0200
commit7833d90adf4996ad3565ca3cf80f5630d6f3da70 (patch)
tree77087e8d747bb2052a6a5f923cc2b5a8aa757d5e /config
parent2aae3aff464282d34087b390e89c3163b06badb8 (diff)
parent067056363be7abfa95c0873c99347e826a109fc6 (diff)
downloadpfsense-packages-7833d90adf4996ad3565ca3cf80f5630d6f3da70.tar.gz
pfsense-packages-7833d90adf4996ad3565ca3cf80f5630d6f3da70.tar.bz2
pfsense-packages-7833d90adf4996ad3565ca3cf80f5630d6f3da70.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config')
-rw-r--r--config/unbound/unbound.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/unbound/unbound.inc b/config/unbound/unbound.inc
index afb3c0b7..76c35277 100644
--- a/config/unbound/unbound.inc
+++ b/config/unbound/unbound.inc
@@ -199,8 +199,10 @@ function unbound_control($action) {
if(!is_service_running("unbound"))
unbound_ctl_exec("start");
/* Link dnsmasq.pid to prevent dhcpleases logging error */
- if (!file_exists("/var/run/dnsmasq.pid"))
+ if (!is_link("/var/run/dnsmasq.pid")) {
+ @unlink("/var/run/dnsmasq.pid");
mwexec("/bin/ln -s /var/run/unbound.pid /var/run/dnsmasq.pid");
+ }
fetch_root_hints();
}
break;