diff options
| author | Ermal <eri@pfsense.org> | 2013-03-19 19:56:55 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2013-03-19 19:56:55 +0000 |
| commit | 9b6010ffc526f4106bc423c8cd8fff12b9ad4cee (patch) | |
| tree | d85ae0214be8f84ab4da1caa6b47f8fc2db7a02a /etc/inc | |
| parent | 10e000f7d115571c2f6075d2b88d3aaeeeeb8e2b (diff) | |
| download | pfsense-9b6010ffc526f4106bc423c8cd8fff12b9ad4cee.zip pfsense-9b6010ffc526f4106bc423c8cd8fff12b9ad4cee.tar.gz | |
Run rtsold only for one reply since it will spam with dhcp6c processes otherwise. Also remove ambiguity by using curlies in functions
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/interfaces.inc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 56f626d..aab915e 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -2694,10 +2694,12 @@ function find_dhclient_process($interface) { function find_rtsold_process($interface) { global $g; - if ($interface) + if ($interface) { if (isvalidpid("{$g['varrun_path']}/rtsold_{$interface}.pid")) $pid = trim(file_get_contents("{$g['varrun_path']}/rtsold_{$interface}.pid"), " \n"); - else + else + retun (false); + } else return(false); return intval($pid); @@ -2706,10 +2708,12 @@ function find_rtsold_process($interface) { function find_dhcp6c_process($interface) { global $g; - if ($interface) + if ($interface) { if (isvalidpid("{$g['varrun_path']}/dhcp6c_{$interface}.pid")) $pid = trim(file_get_contents("{$g['varrun_path']}/dhcp6c_{$interface}.pid"), " \n"); - else + else + retun (false); + } else return(false); return intval($pid); @@ -3577,7 +3581,7 @@ function interface_dhcpv6_configure($interface = "wan", $wancfg) { /* fire up rtsold for IPv6 RAs first, this backgrounds immediately. It will call dhcp6c */ if (isvalidpid("{$g['varrun_path']}/rtsold_{$wanif}.pid")) killbypid("{$g['varrun_path']}/rtsold_{$wanif}.pid"); - mwexec("/usr/sbin/rtsold -m -p {$g['varrun_path']}/rtsold_{$wanif}.pid -O {$g['varetc_path']}/rtsold_{$wanif}_script.sh {$wanif}"); + mwexec("/usr/sbin/rtsold -1 -p {$g['varrun_path']}/rtsold_{$wanif}.pid -O {$g['varetc_path']}/rtsold_{$wanif}_script.sh {$wanif}"); /* NOTE: will be called from rtsold invoked script * link_interface_to_track6($interface, "update"); |
