diff options
author | Renato Botelho <garga@FreeBSD.org> | 2013-02-20 09:41:26 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2013-02-20 09:41:26 -0300 |
commit | 1f56ce58668708485f9d95c9b01e72519dde87b4 (patch) | |
tree | cf192c4001530f4cd3ab3ad19f640b8719fe36f4 /etc | |
parent | 2675f511cc6b6734ed2f5b526bc7c6454ecda7fd (diff) | |
download | pfsense-1f56ce58668708485f9d95c9b01e72519dde87b4.zip pfsense-1f56ce58668708485f9d95c9b01e72519dde87b4.tar.gz |
Fix dhcp v6 config section name for console setup and check on interfaces.php, the correct is dhcpdv6 instead of dhcpd6. Fixes #2827
Diffstat (limited to 'etc')
-rwxr-xr-x | etc/rc.initial.setlanip | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip index 774cda0..6bebf86 100755 --- a/etc/rc.initial.setlanip +++ b/etc/rc.initial.setlanip @@ -323,8 +323,8 @@ $config['interfaces'][$interface]['enable'] = true; function console_configure_dhcpd($version = 4) { global $g, $config, $restart_dhcpd, $fp, $interface, $dry_run; - $label_IPvX = ($version === 6) ? "IPv6" : "IPv4"; - $dhcpd = ($version === 6) ? "dhcpd6" : "dhcpd"; + $label_IPvX = ($version === 6) ? "IPv6" : "IPv4"; + $dhcpd = ($version === 6) ? "dhcpdv6" : "dhcpd"; if($g['services_dhcp_server_enable']) $yn = prompt_for_enable_dhcp_server($version); @@ -396,17 +396,17 @@ if($config['interfaces']['lan']) { if($config['dhcpd']) if($config['dhcpd']['wan']) unset($config['dhcpd']['wan']); - if($config['dhcpd6']) - if($config['dhcpd6']['wan']) - unset($config['dhcpd6']['wan']); + if($config['dhcpdv6']) + if($config['dhcpdv6']['wan']) + unset($config['dhcpdv6']['wan']); } if(!$config['interfaces']['lan']) { unset($config['interfaces']['lan']); if($config['dhcpd']['lan']) unset($config['dhcpd']['lan']); - if($config['dhcpd6']['lan']) - unset($config['dhcpd6']['lan']); + if($config['dhcpdv6']['lan']) + unset($config['dhcpdv6']['lan']); unset($config['shaper']); unset($config['ezshaper']); unset($config['nat']); |