summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2016-07-26 10:58:09 +0930
committerRenato Botelho <renato@netgate.com>2016-08-01 17:56:58 -0300
commitad73ced64b24b534497c4a2596cf31d8e853c8cb (patch)
tree324de3524adc4de43c2c37f48af1816965bd4580
parentf2a230d98151886c6bd23708fd79321adda121b9 (diff)
downloadpfsense-ad73ced64b24b534497c4a2596cf31d8e853c8cb.zip
pfsense-ad73ced64b24b534497c4a2596cf31d8e853c8cb.tar.gz
Remove '-x' flag from dhcpwithoutra launch of dhcp6c
This is the equivalent fix for the RELENG_2_3 branch to pull request #3078
-rw-r--r--src/etc/inc/interfaces.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 1a25d6b..3c4a1d4 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -4016,7 +4016,7 @@ function interface_dhcpv6_configure($interface = "wan", $wancfg) {
if (isset($wancfg['dhcp6withoutra'])) {
kill_dhcp6client_process($wanif);
- mwexec("/usr/local/sbin/dhcp6c {$debugOption} -x -c {$g['varetc_path']}/dhcp6c_wan.conf -p {$g['varrun_path']}/dhcp6c_{$wanif}.pid {$wanif}");
+ mwexec("/usr/local/sbin/dhcp6c {$debugOption} -c {$g['varetc_path']}/dhcp6c_wan.conf -p {$g['varrun_path']}/dhcp6c_{$wanif}.pid {$wanif}");
mwexec("/usr/bin/logger -t mwtag 'Starting dhcp6 client for interface wan({$wanif} in IPoE mode)'");
}
mwexec("/usr/sbin/rtsold -1 -p {$g['varrun_path']}/rtsold_{$wanif}.pid -O {$g['varetc_path']}/rtsold_{$wanif}_script.sh {$wanif}");
OpenPOWER on IntegriCloud