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