summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2013-09-06 13:55:40 -0400
committerjim-p <jimp@pfsense.org>2013-09-06 13:56:56 -0400
commitcf07d574334e5f10d2e8117c8edfbc700fe8f689 (patch)
tree863ea0e893ff6c6a5148e89ce451de1068dbe044
parentd3b3240bd0991224f7caa3ba308ada532dea6bbe (diff)
downloadpfsense-cf07d574334e5f10d2e8117c8edfbc700fe8f689.zip
pfsense-cf07d574334e5f10d2e8117c8edfbc700fe8f689.tar.gz
Do not sync DHPCv6, it must operate independetly. Ticket #3184
-rwxr-xr-xetc/rc.filter_synchronize2
-rwxr-xr-xusr/local/www/system_hasync.php2
2 files changed, 1 insertions, 3 deletions
diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize
index d741640..318eaf4 100755
--- a/etc/rc.filter_synchronize
+++ b/etc/rc.filter_synchronize
@@ -322,8 +322,6 @@ if (is_array($config['hasync'])) {
}
if ($hasync['synchronizedhcpd'] != "" and is_array($config['dhcpd']))
$sections[] = 'dhcpd';
- if ($hasync['synchronizedhcpd'] != "" and is_array($config['dhcpdv6']))
- $sections[] = 'dhcpdv6';
if ($hasync['synchronizewol'] != "") {
if (!is_array($config['wol']))
$config['wol'] = array();
diff --git a/usr/local/www/system_hasync.php b/usr/local/www/system_hasync.php
index a686581..fbd5388 100755
--- a/usr/local/www/system_hasync.php
+++ b/usr/local/www/system_hasync.php
@@ -259,7 +259,7 @@ include("head.inc");
<td class="vtable">
<input id='synchronizedhcpd' type='checkbox' name='synchronizedhcpd' value='on' <?php if ($pconfig['synchronizedhcpd'] === "on") echo "checked='checked'"; ?> />
<br />
- When this option is enabled, this system will automatically sync the DHCP Server settings over to the other HA host when changes are made.
+ When this option is enabled, this system will automatically sync the DHCP Server settings over to the other HA host when changes are made. This only applies to DHCP for IPv4.
</td>
</tr>
<tr valign="top">
OpenPOWER on IntegriCloud