fix shell errors with IFS

diff --git a/scripts/ifdown b/scripts/ifdown
index 784b1e28d4dbbeacf3459c099fa0096873bdcefc..fa92831c408d314ec04e8488a27a6dd026975dd8 100755 (executable)
--- a/scripts/ifdown
+++ b/scripts/ifdown
@@ -2,10 +2,10 @@
 
 net=$1
 
 
 net=$1
 

+saveifs="$IFS"

 IFS=';'
 
 IFS=';'
 

-# TODO allow for /etc/sysconfig/$net also
-test -f /etc/sysconfig/$net.net || echo "unknown network configuration '$net'" >&2 && exit 1
+test -f /etc/networks/$net || (echo "unknown network configuration '$net'" >&2 && exit 1)

  
 ifdown_post() {
        return 0
  
 ifdown_post() {
        return 0


@@ -15,20 +15,25 @@ ifdown_pre() {
        return 0
 }
 
        return 0
 }
 

-. /etc/sysconfig/$net.net
+. /etc/networks/$net

 
 

-#if [ $enable = 'no' || $enable -eq 0 ]; then; exit 0; fi
+if [ $enable = 'no' ]; then exit 0; fi
+#if [ $enable -eq 0 ]; then exit 0; fi

 
 ifdown_pre
 
 #ip link set dev $dev up
 
 for r in $route; do
 
 ifdown_pre
 
 #ip link set dev $dev up
 
 for r in $route; do

+       IFS="$saveifs"

        ip route del $r
        ip route del $r

+       IFS=';'

 done
 
 for address in $addr do
 done
 
 for address in $addr do

+       IFS="$saveifs"

        ip addr del $address dev $dev
        ip addr del $address dev $dev

+       IFS=';'

 done
 
 # how do we determine if we should bring the link down?
 done
 
 # how do we determine if we should bring the link down?

diff --git a/scripts/ifup b/scripts/ifup
index 98b5c59be30969454bf591edadc681e6f27420b6..d9f2df42814ae77bbdffa16adffd3ed47f6dda49 100755 (executable)
--- a/scripts/ifup
+++ b/scripts/ifup
@@ -2,10 +2,10 @@
 
 net=$1
 
 
 net=$1
 

+saveifs="$IFS"

 IFS=';'
 
 IFS=';'
 

-# TODO allow for /etc/sysconfig/$net also
-test -f /etc/sysconfig/$net.net || echo "unknown network configuration '$net'" >&2 && exit 1
+test -f /etc/networks/$net || (echo "unknown network configuration '$net'" >&2 && exit 1)

  
 ifup_post() {
        return 0
  
 ifup_post() {
        return 0


@@ -15,20 +15,25 @@ ifup_pre() {
        return 0
 }
 
        return 0
 }
 

-. /etc/sysconfig/$net.net
+. /etc/networks/$net

 
 

-if [ $enable = 'no' || $enable -eq 0 ]; then; exit 0; fi
+if [ "$enable" = 'no' ]; then exit 0; fi
+#if [ "$enable" -eq 0 ]; then exit 0; fi

 
 ifup_pre
 
 ip link set dev $dev up
 
 for address in $addr do
 
 ifup_pre
 
 ip link set dev $dev up
 
 for address in $addr do

+       IFS="$saveifs"

        ip addr add $address dev $dev
        ip addr add $address dev $dev

+       IFS=';'

 done
 
 for r in $route; do
 done
 
 for r in $route; do

+       IFS="$saveifs"

        ip route add $r
        ip route add $r

+       IFS=';'

 done
 
 ifup_post
 done
 
 ifup_post

diff --git a/scripts/localhost.net b/scripts/localhost.net
new file mode 100644 (file)
index 0000000..b295a28
--- /dev/null
+++ b/scripts/localhost.net
@@ -0,0 +1,4 @@
+dev=lo
+#addr=127.0.0.1
+addr=
+route=