summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Kowis2007-05-14 17:46:15 -0500
committerEric Sandall2007-05-14 21:37:11 -0700
commitb690f7bd781e601e04a8d14e824bc5566894036a (patch)
tree36f2f4c75254023cda664ea0603129fa10b1bd7b
parenta38cb6b9f85e519735bb3ea033347ae2dc4bf55f (diff)
net-tools
Fixed bug 13773 (cherry picked from commit abf1c680459fb0bba9db4718b4d2c9faaec21388)
-rwxr-xr-xnet/net-tools/DETAILS2
-rw-r--r--net/net-tools/HISTORY4
-rw-r--r--net/net-tools/ifdown5
-rw-r--r--net/net-tools/ifup4
4 files changed, 9 insertions, 6 deletions
diff --git a/net/net-tools/DETAILS b/net/net-tools/DETAILS
index d3d369ba0f..b67e80322e 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 c0307470ce..815953948a 100644
--- a/net/net-tools/HISTORY
+++ b/net/net-tools/HISTORY
@@ -1,3 +1,7 @@
+2007-05-14 David Kowis <dkowis@shlrm.org>
+ * ifup, ifdown: fixing the stupidity with these things, bug 13773
+ * DETAILS: PATCHLEVEL++
+
2007-03-09 Thomas Orgis <sobukus@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 7ae0aaa431..106e00a1b5 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 2feb7cf3ca..cee462bebc 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
}