diff options
| -rw-r--r-- | etc/inc/globals.inc | 3 | ||||
| -rw-r--r-- | etc/inc/services.inc | 6 | ||||
| -rwxr-xr-x | etc/rc.initial.setlanip | 5 | ||||
| -rwxr-xr-x | usr/local/www/fbegin.inc | 5 |
4 files changed, 14 insertions, 5 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 92dce05..2380b7f 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -73,6 +73,7 @@ $g = array( "captiveportal_element_sizelimit" => 262144, "xmlrpcpath" => "/pfSense/xmlrpc.php", "embeddedbootupslice" => "/dev/ad0a", + "services_dhcp_server_enable" => true, "update_url" => "http://updates.pfSense.com/_updaters", "update_manifest" => "http://updates.pfSense.com/manifest", "wireless_regex" => "/^(ndis|wi|ath|an|ral|ural|wai|iwi|awi|wlan|rum)/", @@ -86,4 +87,4 @@ $iptos = array("lowdelay", "throughput", "reliability"); /* TCP flags */ $tcpflags = array("syn", "ack", "fin", "rst", "psh", "urg"); -?> +?>
\ No newline at end of file diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 559cdce..7bc11cb 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -42,6 +42,10 @@ function load_balancer_use_sticky() { function services_dhcpd_configure() { global $config, $g; + + if($g['services_dhcp_server_enable'] == false) + return; + if(isset($config['system']['developerspew'])) { $mt = microtime(); echo "services_dhcpd_configure($if) being called $mt\n"; @@ -1253,4 +1257,4 @@ function upnp_start() { } } -?> +?>
\ No newline at end of file diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip index 3d81e7c..bd536dd 100755 --- a/etc/rc.initial.setlanip +++ b/etc/rc.initial.setlanip @@ -136,7 +136,8 @@ $config['interfaces'][$interface]['ipaddr'] = $intip; $config['interfaces'][$interface]['subnet'] = $intbits; - $yn = prompt_for_enable_dhcp_server(); + if($g['services_dhcp_server_enable']) + $yn = prompt_for_enable_dhcp_server(); // TODO: Add DHCP IPv6 support if ($yn == "y") { @@ -237,4 +238,4 @@ fgets($fp); fclose($fp); -?> +?>
\ No newline at end of file diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index 5af5ae1..7f3cfca 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -180,7 +180,10 @@ if ($_REQUEST['noticeaction'] == 'acknowledge') { <?=output_menu_item("/services_captiveportal.php", "Captive Portal");?> <?=output_menu_item("/services_dnsmasq.php", "DNS Forwarder");?> <?=output_menu_item("/services_dhcp_relay.php", "DHCP Relay");?> - <?=output_menu_item("/services_dhcp.php", "DHCP Server");?> + <?php + if($g['services_dhcp_server_enable']) + output_menu_item("/services_dhcp.php", "DHCP Server"); + ?> <?=output_menu_item("/services_dyndns.php", "Dynamic DNS");?> <?=output_menu_item("/load_balancer_pool.php", "Load Balancer");?> <?=output_menu_item("/pkg_edit.php?xml=olsrd.xml&id=0", "OLSR");?> |
