diff options
author | marjohn56 <martin@queens-park.com> | 2017-03-12 18:25:07 +0000 |
---|---|---|
committer | marjohn56 <martin@queens-park.com> | 2017-03-12 22:25:48 +0000 |
commit | 72c34055ec515d66e89c9850152def3a88a478fd (patch) | |
tree | a379f2b261beb0b4906f9b896a118772c7fb5ad8 /src/etc/inc/interfaces.inc | |
parent | 07c304a5593e4fc7d574964bbf3641f92c16d8fa (diff) | |
download | pfsense-72c34055ec515d66e89c9850152def3a88a478fd.zip pfsense-72c34055ec515d66e89c9850152def3a88a478fd.tar.gz |
Fix Vars for Interface naming
Diffstat (limited to 'src/etc/inc/interfaces.inc')
-rw-r--r-- | src/etc/inc/interfaces.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 57f53fb..2df8c99 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -3104,7 +3104,7 @@ function reset_dhcp6client_process($interface) { } } -function run_dhcp6client_process($interface, $wancfg) { +function run_dhcp6client_process($interface, $interface_name, $wancfg) { global $g; $debugOption = isset($wancfg['dhcp6debug']) ? "-D" : "-d"; @@ -3118,19 +3118,19 @@ function run_dhcp6client_process($interface, $wancfg) { * It should not happen as the process should have been killed and the * lock deleted. */ + if (!file_exists("/tmp/dhcp6c_{$interface}_lock")) { - kill_dhcp6client_process($realif, true); - + kill_dhcp6client_process($interface, true); /* Lock it to avoid multiple runs */ touch("/tmp/dhcp6c_{$interface}_lock"); mwexec("/usr/local/sbin/dhcp6c {$debugOption} " . "{$noreleaseOption} " . - "-c {$g['varetc_path']}/dhcp6c_wan.conf " . + "-c {$g['varetc_path']}/dhcp6c_{$interface_name}.conf " . "-p {$g['varrun_path']}/dhcp6c_{$interface}.pid " . $interface); log_error(sprintf(gettext( "Starting dhcp6 client for interface wan %s in DHCP6 without RA mode"), - $wanif)); + $interface)); } } @@ -4270,7 +4270,7 @@ function interface_dhcpv6_configure($interface = "wan", $wancfg) { * Otherwise it is not ready to accept and will fail. */ sleep(3); - run_dhcp6client_process($wanif,$wancfg); + run_dhcp6client_process($wanif,$interface,$wancfg); } } else { /* |