diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-02-04 23:56:18 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-02-04 23:56:18 -0600 |
| commit | f77c8e9605a0ad5dd06143cedfbc65ac91836bae (patch) | |
| tree | 9c4203a7977116a5afe56a57e2f950e19764eda8 | |
| parent | 2fadcec3e6ce174607fdbae62552e943c79d8346 (diff) | |
| parent | 3363c02b75a0acd8a76e06cd714e34f5c3929610 (diff) | |
| download | pfsense-f77c8e9605a0ad5dd06143cedfbc65ac91836bae.zip pfsense-f77c8e9605a0ad5dd06143cedfbc65ac91836bae.tar.gz | |
Merge pull request #2585 from k-paulius/patch-pkg-syslog-v2
| -rw-r--r-- | src/etc/inc/interfaces.inc | 3 | ||||
| -rw-r--r-- | src/usr/local/www/interfaces.php | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index a3f1c2c..4089a10 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -4031,7 +4031,8 @@ function interface_dhcpv6_configure($interface = "wan", $wancfg) { $rtsoldscript .= "\t/bin/pkill -F {$g['varrun_path']}/dhcp6c_{$wanif}.pid\n"; $rtsoldscript .= "\t/bin/sleep 1\n"; $rtsoldscript .= "fi\n"; - $rtsoldscript .= "/usr/local/sbin/dhcp6c -d -c {$g['varetc_path']}/dhcp6c_{$interface}.conf -p {$g['varrun_path']}/dhcp6c_{$wanif}.pid {$wanif}\n"; + $debugOption = isset($wancfg['dhcp6debug']) ? "-D" : "-d"; + $rtsoldscript .= "/usr/local/sbin/dhcp6c {$debugOption} -c {$g['varetc_path']}/dhcp6c_{$interface}.conf -p {$g['varrun_path']}/dhcp6c_{$wanif}.pid {$wanif}\n"; $rtsoldscript .= "/usr/bin/logger -t rtsold \"Starting dhcp6 client for interface {$interface}({$wanif})\"\n"; /* Add wide-dhcp6c shell script here. Because we can not pass a argument to it. */ if (!@file_put_contents("{$g['varetc_path']}/rtsold_{$wanif}_script.sh", $rtsoldscript)) { diff --git a/src/usr/local/www/interfaces.php b/src/usr/local/www/interfaces.php index 79aa634..99adef4 100644 --- a/src/usr/local/www/interfaces.php +++ b/src/usr/local/www/interfaces.php @@ -316,6 +316,7 @@ switch ($wancfg['ipaddrv6']) { $pconfig['type6'] = "dhcp6"; $pconfig['dhcp6prefixonly'] = isset($wancfg['dhcp6prefixonly']); $pconfig['dhcp6usev4iface'] = isset($wancfg['dhcp6usev4iface']); + $pconfig['dhcp6debug'] = isset($wancfg['dhcp6debug']); break; case "6to4": $pconfig['type6'] = "6to4"; @@ -996,6 +997,7 @@ if ($_POST['apply']) { unset($wancfg['dhcp6-ia-pd-send-hint']); unset($wancfg['dhcp6prefixonly']); unset($wancfg['dhcp6usev4iface']); + unset($wancfg['dhcp6debug']); unset($wancfg['track6-interface']); unset($wancfg['track6-prefix-id']); unset($wancfg['prefix-6rd']); @@ -1241,6 +1243,9 @@ if ($_POST['apply']) { if ($_POST['dhcp6usev4iface'] == "yes") { $wancfg['dhcp6usev4iface'] = true; } + if ($_POST['dhcp6debug'] == "yes") { + $wancfg['dhcp6debug'] = true; + } if (!empty($_POST['adv_dhcp6_interface_statement_send_options'])) { $wancfg['adv_dhcp6_interface_statement_send_options'] = $_POST['adv_dhcp6_interface_statement_send_options']; @@ -2121,6 +2126,13 @@ $section->addInput(new Form_Checkbox( $pconfig['dhcp6-ia-pd-send-hint'] )); +$section->addInput(new Form_Checkbox( + 'dhcp6debug', + 'Debug', + 'Start DHCP6 client in debug mode', + $pconfig['dhcp6debug'] +)); + $section->addInput(new Form_Input( 'adv_dhcp6_config_file_override_path', 'Configuration File Override', |
