Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Subject: [PATCH] iproute2: de-bash scripts |
| 2 | |
| 3 | de-bash these two scripts to make iproute2 not depend on bash. |
| 4 | |
| 5 | Upstream-Status: Pending |
| 6 | |
| 7 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| 8 | |
| 9 | --- |
| 10 | ip/ifcfg | 15 ++++++++------- |
| 11 | ip/rtpr | 2 +- |
| 12 | 2 files changed, 9 insertions(+), 8 deletions(-) |
| 13 | |
| 14 | diff --git a/ip/ifcfg b/ip/ifcfg |
| 15 | index 083d9df..60bcf1f 100644 |
| 16 | --- a/ip/ifcfg |
| 17 | +++ b/ip/ifcfg |
| 18 | @@ -1,12 +1,13 @@ |
| 19 | -#! /bin/bash |
| 20 | +#! /bin/sh |
| 21 | |
| 22 | CheckForwarding () { |
| 23 | - local sbase fwd |
| 24 | + local sbase fwd forwarding |
| 25 | sbase=/proc/sys/net/ipv4/conf |
| 26 | fwd=0 |
| 27 | if [ -d $sbase ]; then |
| 28 | for dir in $sbase/*/forwarding; do |
| 29 | - fwd=$[$fwd + `cat $dir`] |
| 30 | + forwarding=`cat $dir` |
| 31 | + fwd=$(($fwd+$forwarding)) |
| 32 | done |
| 33 | else |
| 34 | fwd=2 |
| 35 | @@ -127,12 +128,12 @@ fi |
| 36 | arping -q -A -c 1 -I $dev $ipaddr |
| 37 | noarp=$? |
| 38 | ( sleep 2 ; |
| 39 | - arping -q -U -c 1 -I $dev $ipaddr ) >& /dev/null </dev/null & |
| 40 | + arping -q -U -c 1 -I $dev $ipaddr ) > /dev/null 2>&1 </dev/null & |
| 41 | |
| 42 | -ip route add unreachable 224.0.0.0/24 >& /dev/null |
| 43 | -ip route add unreachable 255.255.255.255 >& /dev/null |
| 44 | +ip route add unreachable 224.0.0.0/24 > /dev/null 2>&1 |
| 45 | +ip route add unreachable 255.255.255.255 > /dev/null 2>&1 |
| 46 | if [ `ip link ls $dev | grep -c MULTICAST` -ge 1 ]; then |
| 47 | - ip route add 224.0.0.0/4 dev $dev scope global >& /dev/null |
| 48 | + ip route add 224.0.0.0/4 dev $dev scope global > /dev/null 2>&1 |
| 49 | fi |
| 50 | |
| 51 | if [ $fwd -eq 0 ]; then |
| 52 | diff --git a/ip/rtpr b/ip/rtpr |
| 53 | index c3629fd..674198d 100644 |
| 54 | --- a/ip/rtpr |
| 55 | +++ b/ip/rtpr |
| 56 | @@ -1,4 +1,4 @@ |
| 57 | -#! /bin/bash |
| 58 | +#! /bin/sh |
| 59 | |
| 60 | exec tr "[\\\\]" "[ |
| 61 | ]" |
| 62 | -- |
| 63 | 1.7.9.5 |
| 64 | |