From f31e556078d1e2e249a0aa5281dfa8d23832320a Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 8 Dec 2016 23:18:11 +0100 Subject: [PATCH] dnsmasq: since this was always based on a hardwired /etc/hosts... The regdhcp conditional option never really worked in the first place. Dhcplease registration is controlled by regdhcp and regdhcpstatic elsewhere already and we always need to include this file. PR: https://forum.opnsense.org/index.php?topic=4041 --- src/etc/inc/plugins.inc.d/dnsmasq.inc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/etc/inc/plugins.inc.d/dnsmasq.inc b/src/etc/inc/plugins.inc.d/dnsmasq.inc index 34a1df20f..e1728be62 100644 --- a/src/etc/inc/plugins.inc.d/dnsmasq.inc +++ b/src/etc/inc/plugins.inc.d/dnsmasq.inc @@ -85,11 +85,7 @@ function dnsmasq_configure_do($verbose = false) flush(); } - $args = ""; - - if (isset($config['dnsmasq']['regdhcp'])) { - $args .= " -H /var/etc/dnsmasq-hosts "; - } + $args = ' -H /var/etc/dnsmasq-hosts '; /* Setup listen port, if non-default */ if (isset($config['dnsmasq']['port']) && is_port($config['dnsmasq']['port'])) {