diff options
author | marjohn56 <martin@queens-park.com> | 2016-12-19 21:32:55 +0000 |
---|---|---|
committer | marjohn56 <martin@queens-park.com> | 2016-12-19 21:32:55 +0000 |
commit | 505635302a3d555eb6f82cb552c99c7ecb813f46 (patch) | |
tree | 1a28b5bed079e6c08f9cf3a7fad104f0d68ad1e6 /src/etc/inc/interfaces.inc | |
parent | 806a202a37389110d32a513588a4f82c2e677728 (diff) | |
download | pfsense-505635302a3d555eb6f82cb552c99c7ecb813f46.zip pfsense-505635302a3d555eb6f82cb552c99c7ecb813f46.tar.gz |
dhcp6c no release
Script changes to allow no-release option of dhcp6c. These changes to be
used in conjunction with pfSense/FreeBSD-ports/net/dhcp6c recent change
from PR #231
Diffstat (limited to 'src/etc/inc/interfaces.inc')
-rw-r--r-- | src/etc/inc/interfaces.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index b1ef885..be68bdd 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -3974,10 +3974,12 @@ function interface_dhcpv6_configure($interface = "wan", $wancfg) { $rtsoldscript .= "/bin/sleep 1\n"; } $debugOption = isset($wancfg['dhcp6debug']) ? "-D" : "-d"; + $noreleaseOption = isset($wancfg['dhcp6norelease']) ? "-n" : ""; + /* add the start of dhcp6c to the rtsold script if we are going to wait for ra */ if (!isset($wancfg['dhcp6withoutra'])) { - $rtsoldscript .= "/usr/local/sbin/dhcp6c {$debugOption} -c {$g['varetc_path']}/dhcp6c_{$interface}.conf -p {$g['varrun_path']}/dhcp6c_{$wanif}.pid {$wanif}\n"; + $rtsoldscript .= "/usr/local/sbin/dhcp6c {$debugOption} {$noreleaseOption} -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. */ @@ -4003,7 +4005,7 @@ function interface_dhcpv6_configure($interface = "wan", $wancfg) { if (isset($wancfg['dhcp6withoutra'])) { kill_dhcp6client_process($wanif); - mwexec("/usr/local/sbin/dhcp6c {$debugOption} -c {$g['varetc_path']}/dhcp6c_wan.conf -p {$g['varrun_path']}/dhcp6c_{$wanif}.pid {$wanif}"); + mwexec("/usr/local/sbin/dhcp6c {$debugOption} {$noreleaseOption} -c {$g['varetc_path']}/dhcp6c_wan.conf -p {$g['varrun_path']}/dhcp6c_{$wanif}.pid {$wanif}"); mwexec("/usr/bin/logger -t info 'Starting dhcp6 client for interface wan({$wanif} in DHCP6 without RA mode)'"); } mwexec("/usr/sbin/rtsold -1 -p {$g['varrun_path']}/rtsold_{$wanif}.pid -O {$g['varetc_path']}/rtsold_{$wanif}_script.sh {$wanif}"); |