aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2011-12-13 00:43:18 -0800
committerRobin H. Johnson <robbat2@gentoo.org>2011-12-13 00:43:18 -0800
commit879e1acd5dc04eee1f7b0cb49d9c1a84e28c525c (patch)
tree69260bc1d493f7ce1e8fdea4b667edc62af2de4d
parent06f6ce408cb7a7099c763ad13e1ad527e761b75f (diff)
net: Support more variants of address family specification.
This includes address family specifications methods to help debug bug 358235 further. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-rw-r--r--net/ifconfig.sh.Linux.in6
-rw-r--r--net/iproute2.sh11
2 files changed, 13 insertions, 4 deletions
diff --git a/net/ifconfig.sh.Linux.in b/net/ifconfig.sh.Linux.in
index 1ac0dd52..80a0b987 100644
--- a/net/ifconfig.sh.Linux.in
+++ b/net/ifconfig.sh.Linux.in
@@ -188,6 +188,12 @@ _add_route()
if [ "$1" = "-A" -o "$1" = "-f" -o "$1" = "-family" ]; then
family="-A $2"
shift; shift
+ elif [ "$1" = "-4" ]; then
+ family="-A inet"
+ shift
+ elif [ "$1" = "-6" ]; then
+ family="-A inet6"
+ shift
fi
if [ -n "${metric}" ]; then
diff --git a/net/iproute2.sh b/net/iproute2.sh
index 4e7e88c8..c8f670ca 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -149,6 +149,12 @@ _add_route()
if [ "$1" = "-A" -o "$1" = "-f" -o "$1" = "-family" ]; then
family="-f $2"
shift; shift
+ elif [ "$1" = "-4" ]; then
+ family="-f inet"
+ shift
+ elif [ "$1" = "-6" ]; then
+ family="-f inet6"
+ shift
fi
if [ $# -eq 3 ]; then
@@ -212,10 +218,7 @@ _trim() {
# This allows for advanced routing tricks
_ip_rule_runner() {
local cmd rules OIFS="${IFS}" family
- if [ "x$1" = "-4" ]; then
- family="$1"
- shift
- elif [ "x$1" = "-6" ]; then
+ if [ "$1" = "-4" -o "$1" = "-6" ]; then
family="$1"
shift
else