summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Baker <warren@decoy.co.za>2014-11-21 21:10:07 +0200
committerWarren Baker <warren@decoy.co.za>2014-11-21 21:24:20 +0200
commit0a5a8df9ebc75de4de229b9a8d23496c9c2877b5 (patch)
treec27c7b6d7beff6d9c4a3de670889850a57f4c946
parent5b506a493f4d5ac671df4828496073a680cb60e5 (diff)
downloadpfsense-0a5a8df9ebc75de4de229b9a8d23496c9c2877b5.zip
pfsense-0a5a8df9ebc75de4de229b9a8d23496c9c2877b5.tar.gz
d DHCPLeases starting before Unbound/DNSMasq and returning a pid not found message. Add missing reload feature
-rw-r--r--etc/inc/services.inc4
-rw-r--r--etc/inc/system.inc2
-rw-r--r--etc/inc/unbound.inc3
3 files changed, 7 insertions, 2 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index a7fdeb4..b8a99ae 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -1864,6 +1864,8 @@ function services_dnsmasq_configure() {
mwexec_bg($cmd);
unset($args);
+ system_dhcpleases_configure();
+
if ($g['booting'])
echo gettext("done.") . "\n";
}
@@ -1903,6 +1905,8 @@ function services_unbound_configure() {
sync_unbound_service();
if ($g['booting'])
echo gettext("done.") . "\n";
+
+ system_dhcpleases_configure();
}
if (!$g['booting']) {
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index babfb46..fd927bd 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -381,8 +381,6 @@ function system_hosts_generate() {
unbound_hosts_generate();
}
- system_dhcpleases_configure();
-
return 0;
}
diff --git a/etc/inc/unbound.inc b/etc/inc/unbound.inc
index eb62744..c7b0ce7 100644
--- a/etc/inc/unbound.inc
+++ b/etc/inc/unbound.inc
@@ -427,6 +427,9 @@ function do_as_unbound_user($cmd) {
case "stop":
mwexec("echo '/usr/local/sbin/unbound-control stop' | /usr/bin/su -m unbound", true);
break;
+ case "reload":
+ mwexec("echo '/usr/local/sbin/unbound-control reload' | /usr/bin/su -m unbound", true);
+ break;
case "unbound-anchor":
mwexec("echo '/usr/local/sbin/unbound-anchor -a {$g['unbound_chroot_path']}/root.key' | /usr/bin/su -m unbound", true);
break;
OpenPOWER on IntegriCloud