From: Serge L. <sma...@us...> - 2010-11-04 07:07:02
|
Update of /cvsroot/devil-linux/build/scripts/scripts In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8823 Modified Files: upgrade-config Log Message: - added check for the empty "ROUTE" statement Index: upgrade-config =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/scripts/upgrade-config,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- upgrade-config 7 Sep 2010 19:54:33 -0000 1.41 +++ upgrade-config 4 Nov 2010 07:06:54 -0000 1.42 @@ -355,31 +355,34 @@ unset ROUTE net gw eval $line - if echo $ROUTE | grep "via\|dev" > /dev/null 2>&1; then echo $line; continue ; fi - - if echo $ROUTE | grep ":" > /dev/null 2>&1; then - net=$(echo $ROUTE | cut -d':' -f1) - gw=$(echo $ROUTE | cut -d':' -f2) - else - net=$(echo $ROUTE) # to remove spaces - fi - - #echo $net $gw $dev - - # fixes - if echo $net | grep default > /dev/null 2>&1; then - net="default"; - fi - - if [ x"$gw" == "x" ]; then - dev="dev \$DEVICE"; - else - gw="via $gw"; - fi - if [ -n "$gw" ]; then - echo "ROUTE=\"$net $gw\""; - else - echo "ROUTE=\"$net $dev\""; + if [ -n "$ROUTE" ]; then + + if echo $ROUTE | grep "via\|dev" > /dev/null 2>&1; then echo $line; continue ; fi + + if echo $ROUTE | grep ":" > /dev/null 2>&1; then + net=$(echo $ROUTE | cut -d':' -f1) + gw=$(echo $ROUTE | cut -d':' -f2) + else + net=$(echo $ROUTE) # to remove spaces + fi + + #echo $net $gw $dev + + # fixes + if echo $net | grep default > /dev/null 2>&1; then + net="default"; + fi + + if [ x"$gw" == "x" ]; then + dev="dev \$DEVICE"; + else + gw="via $gw"; + fi + if [ -n "$gw" ]; then + echo "ROUTE=\"$net $gw\""; + else + echo "ROUTE=\"$net $dev\""; + fi fi done @@ -391,7 +394,7 @@ if [ -n "$version" ]; then # conversion from version "x" - # Versions other then '1' was not released yet" + # Versions other than '1' was not released yet" continue else cp $iface $iface.conversion |