Merge branch 'master' of https://github.com/wagonza/pfsense into wagonza

This commit is contained in:
Chris Buechler 2014-11-22 15:33:06 -06:00
commit 38e9197673
3 changed files with 7 additions and 2 deletions

View File

@ -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']) {

View File

@ -381,8 +381,6 @@ function system_hosts_generate() {
unbound_hosts_generate();
}
system_dhcpleases_configure();
return 0;
}

View File

@ -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;