[SM-Commit] GIT changes to stable-rc-0.10 grimoire by Eric Sandall (b690f7bd781e601e04a8d14e824bc5566894036a)

Eric Sandall scm at sourcemage.org
Tue May 15 00:39:02 EDT 2007


GIT changes to stable-rc-0.10 grimoire by Eric Sandall <sandalle at sourcemage.org>:

 net/net-tools/DETAILS |    2 +-
 net/net-tools/HISTORY |    4 ++++
 net/net-tools/ifdown  |    5 ++---
 net/net-tools/ifup    |    4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit b690f7bd781e601e04a8d14e824bc5566894036a
Author: David Kowis <dkowis at shlrm.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    net-tools
    Fixed bug 13773
    (cherry picked from commit abf1c680459fb0bba9db4718b4d2c9faaec21388)

diff --git a/net/net-tools/DETAILS b/net/net-tools/DETAILS
index d3d369b..b67e803 100755
--- a/net/net-tools/DETAILS
+++ b/net/net-tools/DETAILS
@@ -4,7 +4,7 @@
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.tazenda.demon.co.uk/phil/net-tools/$SOURCE
      SOURCE_HASH=sha512:8e1ae9bca726ad7d795a06c58388f9e11c1d617d94eebb9ed18bd11e5f34c6541e1ffe631706c407996db86e78df6e5cf1968a2d90b242b473596fda3b6d1eae
-      PATCHLEVEL=8
+      PATCHLEVEL=9
       LICENSE[0]=GPL
         WEB_SITE=http://www.tazenda.demon.co.uk/phil/net-tools
          ENTERED=20010922
diff --git a/net/net-tools/HISTORY b/net/net-tools/HISTORY
index c030747..8159539 100644
--- a/net/net-tools/HISTORY
+++ b/net/net-tools/HISTORY
@@ -1,3 +1,7 @@
+2007-05-14 David Kowis <dkowis at shlrm.org>
+	* ifup, ifdown: fixing the stupidity with these things, bug 13773
+	* DETAILS: PATCHLEVEL++
+
 2007-03-09 Thomas Orgis <sobukus at sourcemage.org>
 	* ifdown, DETAILS: fix ifdown to work with bash 3.2
 	  (no quoting of regex pattern), PATCHLEVEL++
diff --git a/net/net-tools/ifdown b/net/net-tools/ifdown
index 7ae0aaa..106e00a 100644
--- a/net/net-tools/ifdown
+++ b/net/net-tools/ifdown
@@ -21,10 +21,9 @@ _do_device_down()
     echo "Stopping dhcpcd on $DEV ..."
     dhcpcd -k $DEV &&
     sleep 2
-  else
-    echo "Shutting down network interface $DEV ..."
-    ifconfig $DEV down
   fi
+  echo "Shutting down network interface $DEV ..."
+  ifconfig $DEV 0.0.0.0 down
 }
 
 _do_route_down()
diff --git a/net/net-tools/ifup b/net/net-tools/ifup
index 2feb7cf..cee462b 100644
--- a/net/net-tools/ifup
+++ b/net/net-tools/ifup
@@ -19,9 +19,9 @@ exists_in_text()
 device_is_up()
 {
   if [ -x /usr/bin/grep ]; then
-    /sbin/ifconfig -a | grep -A1 "^${1}\ " | grep 'inet addr' >& /dev/null
+    /sbin/ifconfig ${1} | grep -q "UP"
   else
-    /sbin/ifconfig -a 2>&1 | exists_in_text $1
+    /sbin/ifconfig ${1} 2>&1 | exists_in_text "UP"
   fi
 }
 



More information about the SM-Commit mailing list