diff options
| author | sullrich <sullrich@pfsense.org> | 2009-12-16 09:14:05 -0500 |
|---|---|---|
| committer | sullrich <sullrich@pfsense.org> | 2009-12-16 09:14:05 -0500 |
| commit | 663d19370c1350dee24f554b7d93070c42967947 (patch) | |
| tree | 929716a6988acc3b1986358cb8c4ba12fd68a078 /etc | |
| parent | 869538d53dc557a3bdea048027309b6fd162fc95 (diff) | |
| download | pfsense-663d19370c1350dee24f554b7d93070c42967947.zip pfsense-663d19370c1350dee24f554b7d93070c42967947.tar.gz | |
Do not pass option -l to dnsmasq any longer. Only launch the registration helper daemon if the option is enabled
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/services.inc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index ebf60f9..e896f81 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -42,7 +42,10 @@ function services_parse_dhcpd_hostnames() { $ps = `ps awux | grep isc | grep -v grep | grep parse | awk '{ print $2 }'`; if($ps) exec("kill {$ps}"); - mwexec_bg("sh /etc/rc.parse-isc-dhcpd"); + // Launch if option enabled + if (isset($config['dnsmasq']['regdhcp'])) { + mwexec_bg("sh /etc/rc.parse-isc-dhcpd"); + } } function services_dhcpd_configure() { @@ -637,10 +640,10 @@ function services_dnsmasq_configure() { $args = ""; - if (isset($config['dnsmasq']['regdhcp'])) { - $args .= " -l {$g['dhcpd_chroot_path']}/var/db/dhcpd.leases" . - " -s {$config['system']['domain']}"; - } + //if (isset($config['dnsmasq']['regdhcp'])) { + // $args .= " -l {$g['dhcpd_chroot_path']}/var/db/dhcpd.leases" . + // " -s {$config['system']['domain']}"; + //} if (isset($config['dnsmasq']['domainoverrides']) && is_array($config['dnsmasq']['domainoverrides'])) { foreach($config['dnsmasq']['domainoverrides'] as $override) { @@ -1297,4 +1300,4 @@ function upnp_start() { } } -?> +?>
\ No newline at end of file |
