diff options
| author | Bill Nottingham <notting@redhat.com> | 2004-10-17 03:42:51 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2004-10-17 03:42:51 +0000 |
| commit | 860ee4d2468956a368a5ed78fcd2331285709abe (patch) | |
| tree | 4338d12e76205dfd66f51a373b19289b224f6d8f | |
| parent | 826538c3a9d9d151c35460cabc9dac3bada937cd (diff) | |
| download | initscripts-860ee4d2468956a368a5ed78fcd2331285709abe.tar initscripts-860ee4d2468956a368a5ed78fcd2331285709abe.tar.gz initscripts-860ee4d2468956a368a5ed78fcd2331285709abe.tar.bz2 initscripts-860ee4d2468956a368a5ed78fcd2331285709abe.tar.xz initscripts-860ee4d2468956a368a5ed78fcd2331285709abe.zip | |
some cleanups
| -rwxr-xr-x | sysconfig/network-scripts/ifup-ipv6 | 8 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-sit | 2 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions-ipv6 | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sysconfig/network-scripts/ifup-ipv6 b/sysconfig/network-scripts/ifup-ipv6 index 8422234b..6ff924b0 100755 --- a/sysconfig/network-scripts/ifup-ipv6 +++ b/sysconfig/network-scripts/ifup-ipv6 @@ -149,7 +149,7 @@ fi # Setup additional static IPv6 routes on specified interface, if given if [ -f /etc/sysconfig/static-routes-ipv6 ]; then - LC_ALL=C grep -w "^$DEVICE" /etc/sysconfig/static-routes-ipv6 | while read device args; do + LC_ALL=C grep -w "^$DEVICE" /etc/sysconfig/static-routes-ipv6 2>/dev/null | while read device args; do ipv6_add_route $args $DEVICE done fi @@ -245,7 +245,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then # Add static routes if [ -f /etc/sysconfig/static-routes-ipv6 ]; then - LC_ALL=C grep -w "^tun6to4" /etc/sysconfig/static-routes-ipv6 | while read device network gateway; do + LC_ALL=C grep -w "^tun6to4" /etc/sysconfig/static-routes-ipv6 2>/dev/null | while read device network gateway; do if [ -z "$network" ]; then continue fi @@ -258,8 +258,8 @@ if [ "$IPV6TO4INIT" = "yes" ]; then # Setup additional static IPv6 routes (newer config style) if [ -f "/etc/sysconfig/network-scripts/route6-tun6to4" ]; then - cat "/etc/sysconfig/network-scripts/route6-tun6to4" | sed 's/#.*//g' | grep -v '^[[:space:]]*$' | while read line; do - if echo "$line" | grep -vq 'via'; then + cat "/etc/sysconfig/network-scripts/route6-tun6to4" | sed 's/#.*//g' | LC_ALL=C grep -v '^[[:space:]]*$' | while read line; do + if echo "$line" | LC_ALL=C grep -vq 'via'; then # Add gateway if missing line="$line via $ipv6to4_relay" fi diff --git a/sysconfig/network-scripts/ifup-sit b/sysconfig/network-scripts/ifup-sit index 2f629850..80d5b963 100755 --- a/sysconfig/network-scripts/ifup-sit +++ b/sysconfig/network-scripts/ifup-sit @@ -100,7 +100,7 @@ fi # Setup additional static IPv6 routes on specified interface, if given if [ -f /etc/sysconfig/static-routes-ipv6 ]; then - LC_ALL=C grep -w "^$DEVICE" /etc/sysconfig/static-routes-ipv6 | while read device ipv6route args; do + LC_ALL=C grep -w "^$DEVICE" /etc/sysconfig/static-routes-ipv6 2>/dev/null | while read device ipv6route args; do ipv6_add_route $ipv6route :: $DEVICE done fi diff --git a/sysconfig/network-scripts/network-functions-ipv6 b/sysconfig/network-scripts/network-functions-ipv6 index 677bafa0..3922965f 100644 --- a/sysconfig/network-scripts/network-functions-ipv6 +++ b/sysconfig/network-scripts/network-functions-ipv6 @@ -573,9 +573,9 @@ ipv6_test_addr_exists_on_device() { local test_prefixlength="`echo $convertresult | awk '{ print $3 }'`" if [ -z "$test_prefixlength" ]; then - local testresult="`LC_ALL=C grep "$test_addr .. .. $test_scope .." /proc/net/if_inet6 | LC_ALL=C grep $testdevice$`" + local testresult="`LC_ALL=C grep "$test_addr .. .. $test_scope .." /proc/net/if_inet6 2>/dev/null | LC_ALL=C grep $testdevice$`" else - local testresult="`LC_ALL=C grep "$test_addr .. $test_prefixlength $test_scope .." /proc/net/if_inet6 | LC_ALL=C grep $testdevice$`" + local testresult="`LC_ALL=C grep "$test_addr .. $test_prefixlength $test_scope .." /proc/net/if_inet6 2>/dev/null | LC_ALL=C grep $testdevice$`" fi if [ -n "$testresult" ]; then # exists |