summaryrefslogtreecommitdiffstats
path: root/src/usr/local
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-08-01 17:54:28 -0300
committerRenato Botelho <renato@netgate.com>2016-08-01 17:54:28 -0300
commit317a06f29ee4aef002386c9f8cd161f38a3a30ac (patch)
treef9bcbf783c1080dc0919e0dce75cb98c2d733130 /src/usr/local
parent51d2e7351c03e180b98318812c15f85c79ed2a81 (diff)
parentefd07e5e116a60745706e5d306c1f912eaa0ed78 (diff)
downloadpfsense-317a06f29ee4aef002386c9f8cd161f38a3a30ac.zip
pfsense-317a06f29ee4aef002386c9f8cd161f38a3a30ac.tar.gz
Merge pull request #3063 from phil-davis/dhcpinitbeforera3055_23
Diffstat (limited to 'src/usr/local')
-rw-r--r--src/usr/local/www/interfaces.php13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php
index c8d38f3..beaad37 100644
--- a/src/usr/local/www/interfaces.php
+++ b/src/usr/local/www/interfaces.php
@@ -316,6 +316,7 @@ switch ($wancfg['ipaddrv6']) {
$pconfig['dhcp6prefixonly'] = isset($wancfg['dhcp6prefixonly']);
$pconfig['dhcp6usev4iface'] = isset($wancfg['dhcp6usev4iface']);
$pconfig['dhcp6debug'] = isset($wancfg['dhcp6debug']);
+ $pconfig['dhcp6withoutra'] = isset($wancfg['dhcp6withoutra']);
break;
case "6to4":
$pconfig['type6'] = "6to4";
@@ -1010,6 +1011,7 @@ if ($_POST['apply']) {
unset($wancfg['dhcp6debug']);
unset($wancfg['track6-interface']);
unset($wancfg['track6-prefix-id']);
+ unset($wancfg['dhcp6withoutra']);
unset($wancfg['prefix-6rd']);
unset($wancfg['prefix-6rd-v4plen']);
unset($wancfg['gateway-6rd']);
@@ -1257,6 +1259,10 @@ if ($_POST['apply']) {
$wancfg['dhcp6debug'] = true;
}
+ if ($_POST['dhcp6withoutra'] == "yes") {
+ $wancfg['dhcp6withoutra'] = true;
+ }
+
if (!empty($_POST['adv_dhcp6_interface_statement_send_options'])) {
$wancfg['adv_dhcp6_interface_statement_send_options'] = $_POST['adv_dhcp6_interface_statement_send_options'];
}
@@ -2154,6 +2160,13 @@ $section->addInput(new Form_Checkbox(
$pconfig['dhcp6debug']
));
+$section->addInput(new Form_Checkbox(
+ 'dhcp6withoutra',
+ 'Do not wait for a RA',
+ 'Required by some ISPs, especially those not using PPPoE',
+ $pconfig['dhcp6withoutra']
+));
+
$section->addInput(new Form_Input(
'adv_dhcp6_config_file_override_path',
'Configuration File Override',
OpenPOWER on IntegriCloud