diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-01-18 09:52:37 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-01-18 09:52:37 +0100 |
| commit | 2db19fec13247fa12d1d2e4db5e545388031bab5 (patch) | |
| tree | 65f781d3a88752d89e204ff986b64656e21acf78 | |
| parent | 1f74cd2d101f032472a4968a10b64161652d6c1f (diff) | |
| download | pfsense-2db19fec13247fa12d1d2e4db5e545388031bab5.zip pfsense-2db19fec13247fa12d1d2e4db5e545388031bab5.tar.gz | |
Fix broken merge, change variable name to define inet family
| -rw-r--r-- | etc/inc/system.inc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index d2eb733..4a7f0ed 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -451,22 +451,15 @@ function system_routing_configure($interface = "") { $action = "change"; if(is_ipaddrv6($gatewayip)) { - $inet6 = "-inet6"; + $inetfamily = "-inet6"; } else { - $inet6 = ""; + $inetfamily = "-inet"; } if (is_ipaddr($gatewayip)) { -<<<<<<< HEAD - mwexec("/sbin/route {$action} {$inet6} " . escapeshellarg($rtent['network']) . + mwexec("/sbin/route {$action} {$inetfamily} " . escapeshellarg($rtent['network']) . " " . escapeshellarg($gatewayip)); } else if (!empty($interfacegw)) { - mwexec("/sbin/route {$action} {$inet6} " . escapeshellarg($rtent['network']) . -======= - mwexec("/sbin/route {$action} -inet " . escapeshellarg($rtent['network']) . - " " . escapeshellarg($gatewayip)); - } else if (!empty($interfacegw)) { - mwexec("/sbin/route {$action} -inet " . escapeshellarg($rtent['network']) . ->>>>>>> upstream/master + mwexec("/sbin/route {$action} {$inetfamily} " . escapeshellarg($rtent['network']) . " -iface " . escapeshellarg($interfacegw)); } } |
