diff options
author | jim-p <jimp@pfsense.org> | 2017-01-02 09:34:55 -0500 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2017-01-02 09:34:55 -0500 |
commit | a5d56253d87abeeb76ef480edced9a7a512ad908 (patch) | |
tree | e21433d2c67b338ef08f3311d0a6d75b5fed658d /src/etc/inc/interfaces.inc | |
parent | 80d3effa960ab23112233d2dfb50c35161bd7e03 (diff) | |
parent | 416322ee7d7db1fe9d8d416017e4546162bbb766 (diff) | |
download | pfsense-a5d56253d87abeeb76ef480edced9a7a512ad908.zip pfsense-a5d56253d87abeeb76ef480edced9a7a512ad908.tar.gz |
Merge pull request #3304 from marjohn56/master
Diffstat (limited to 'src/etc/inc/interfaces.inc')
-rw-r--r-- | src/etc/inc/interfaces.inc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index c1fe817..ef9af77 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -3868,6 +3868,13 @@ function interface_dhcpv6_configure($interface = "wan", $wancfg) { $wanif = get_real_interface($interface, "inet6"); $dhcp6cconf = ""; + if (!empty($config['system']['global-v6duid'])) { + // Write the DUID file + if(!write_dhcp6_duid($config['system']['global-v6duid'])) { + log_error(gettext("Failed to write user DUID file!")); + } + } + if ($wancfg['adv_dhcp6_config_file_override']) { // DHCP6 Config File Override $dhcp6cconf = DHCP6_Config_File_Override($wancfg, $wanif); |